Makefile.def: Remove libjava.

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

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

From-SVN: r240662

748 files changed, 0 insertions, 41905 deletions

diff --git a/libjava/org/ietf/jgss/ChannelBinding.h b/libjava/org/ietf/jgss/ChannelBinding.h
deleted file mode 100644
index a83c6f2..0000000
--- 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 04b322c..0000000
--- 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 57560c4..0000000
--- 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 b703521..0000000
--- 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 c33a2bc..0000000
--- 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 28db6a4..0000000
--- 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 6cf3623..0000000
--- 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 6c8c0cc..0000000
--- 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 bddfa39..0000000
--- 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 aea3081..0000000
--- 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 55d913b..0000000
--- 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 31b2b66..0000000
--- 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 aeaa672..0000000
--- 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 5abdbc0..0000000
--- 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 9c5daca..0000000
--- 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 4f77210..0000000
--- 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 90702c2..0000000
--- 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 f582be5..0000000
--- 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 8adb801..0000000
--- 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 16b0214..0000000
--- 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 8be70c2..0000000
--- 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 400b7a8..0000000
--- 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 4234fcb..0000000
--- 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 d41efcd..0000000
--- 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 44e354f..0000000
--- 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 36e6bd81..0000000
--- 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 3dc9cbe..0000000
--- 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 1cb1559..0000000
--- 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 54b15ab..0000000
--- 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 1a7ff40..0000000
--- 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 ca90136..0000000
--- 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 9131a8b..0000000
--- 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 1ceb10d..0000000
--- 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 1d58dc2..0000000
--- 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 78a1e7e..0000000
--- 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 b6e4bb6..0000000
--- 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 b0dbd15..0000000
--- 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 f76b1a8e..0000000
--- 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 8255f06..0000000
--- 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 d0ec304..0000000
--- 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 4b6c3e1..0000000
--- 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 75fde13..0000000
--- 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 bcfc438..0000000
--- 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 c698b0e..0000000
--- 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 56f4c54..0000000
--- 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 52931e2..0000000
--- 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 a703b3f..0000000
--- 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 8c3d485..0000000
--- 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 2bcad19..0000000
--- 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 e62a9b5..0000000
--- 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 27022f3..0000000
--- 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 ca51153..0000000
--- 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 8fdb601..0000000
--- 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 15d5e84..0000000
--- 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 a75c145..0000000
--- 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 8702c14..0000000
--- 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 9a6aa08..0000000
--- 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 ec2bc43..0000000
--- 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 2707f4b..0000000
--- 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 1b12748..0000000
--- 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 c149805..0000000
--- 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 f33cf44..0000000
--- 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 3ec8508..0000000
--- 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 d1df9cb..0000000
--- 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 675b2ef..0000000
--- 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 562e864..0000000
--- 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 3a4e213..0000000
--- 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 8efb8f5..0000000
--- 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 aab7859..0000000
--- 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 5efccc5..0000000
--- 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 9cf7758..0000000
--- 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 07fb343..0000000
--- 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 acb5eb9..0000000
--- 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 c3b29b9..0000000
--- 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 a5ef219..0000000
--- 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 53bfe0a..0000000
--- 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 fba02c5..0000000
--- 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 87b84cc..0000000
--- 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 e138c91..0000000
--- 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 8dab0ac..0000000
--- 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 43540f2..0000000
--- 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 1f03591..0000000
--- 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 2524763..0000000
--- 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 6c0a1d0..0000000
--- 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 c006324..0000000
--- 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 bdc34cd..0000000
--- 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 025a111..0000000
--- 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 6f4dbd9..0000000
--- 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 2d8edbd..0000000
--- 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 94c03da..0000000
--- 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 069d9e0..0000000
--- 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 de45560..0000000
--- 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 8f1102eb..0000000
--- 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 d2e4f4c..0000000
--- 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 5495b84..0000000
--- 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 fc85869..0000000
--- 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 27666d4..0000000
--- 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 6fd5311..0000000
--- 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 5430e67..0000000
--- 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 d0ba6ca..0000000
--- 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 63dbf9d..0000000
--- 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 92dc019..0000000
--- 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 75516cb..0000000
--- 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 c4a0273..0000000
--- 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 ce8f3f0..0000000
--- 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 1f2bea8..0000000
--- 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 92daec5..0000000
--- 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 eef00cc..0000000
--- 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 ec886d8..0000000
--- 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 b2f1034..0000000
--- 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 12b688e..0000000
--- 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 f3debeb..0000000
--- 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 34c170a..0000000
--- 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 81888d8..0000000
--- 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 1ee33c5..0000000
--- 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 f148933..0000000
--- 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 a3689a9..0000000
--- 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 2565926..0000000
--- 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 10bde6e..0000000
--- 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 05a8029..0000000
--- 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 47093d0..0000000
--- 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 6a2bd46..0000000
--- 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 4f053fe..0000000
--- 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 0b21ec9..0000000
--- 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 047f012..0000000
--- 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 a549730..0000000
--- 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 9245781..0000000
--- 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 74d723b..0000000
--- 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 5d8186f..0000000
--- 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 49f2b44..0000000
--- 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 1948a84..0000000
--- 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 817d39d..0000000
--- 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 dadfb37..0000000
--- 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 1482350..0000000
--- 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 440e575..0000000
--- 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 3e9f6cf..0000000
--- 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 a18369e..0000000
--- 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 375ced8..0000000
--- 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 b27bc9c..0000000
--- 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 2586851..0000000
--- 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 52c7150..0000000
--- 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 5919dae..0000000
--- 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 4360604..0000000
--- 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 1d351e6..0000000
--- 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 b1d9b42..0000000
--- 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 f027f0ad..0000000
--- 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 c0f4627..0000000
--- 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 700a0d5..0000000
--- 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 d8832c3..0000000
--- 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 7e97cfd2..0000000
--- 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 d6261de..0000000
--- 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 e0db0f9..0000000
--- 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 e190449..0000000
--- 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 2a7a4db..0000000
--- 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 88be02f..0000000
--- 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 5df6e65..0000000
--- 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 dd16baf..0000000
--- 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 b248abc..0000000
--- 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 fc30bc3..0000000
--- 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 20845ca..0000000
--- 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 fdd9586..0000000
--- 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 96417f4..0000000
--- 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 4c7c43f..0000000
--- 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 d62ef2c..0000000
--- 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 7ce1fb5..0000000
--- 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 5744d7e..0000000
--- 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 ccf7cd1..0000000
--- 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 722cfe0..0000000
--- 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 9516c76..0000000
--- 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 904b54d..0000000
--- 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 706dc28..0000000
--- 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 84dd9c1..0000000
--- 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 475f3d1..0000000
--- 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 a91546c..0000000
--- 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 2f4f6c9..0000000
--- 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 a6b2ca6..0000000
--- 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 1877dda..0000000
--- 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 d4261d6..0000000
--- 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 4ad7faf..0000000
--- 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 cf74a83..0000000
--- 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 a10a8ba..0000000
--- 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 77974be..0000000
--- 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 08afb5e..0000000
--- 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 e71806c..0000000
--- 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 1c1e663..0000000
--- 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 0571385..0000000
--- 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 f0f99543..0000000
--- 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 431ddb2..0000000
--- 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 5569783..0000000
--- 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 efc9b7a..0000000
--- 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 2bb7c67..0000000
--- 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 69882f7..0000000
--- 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 ded12b8..0000000
--- 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 b2fc750..0000000
--- 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 98d0ef9..0000000
--- 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 c9f38ba..0000000
--- 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 78a33f8..0000000
--- 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 a537e9b..0000000
--- 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 c090bfa..0000000
--- 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 dadd61c..0000000
--- 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 4c15eb8..0000000
--- 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 bdbd286..0000000
--- 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 eff79af..0000000
--- 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 53a55b5..0000000
--- 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 3ff439e..0000000
--- 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 8686fbb..0000000
--- 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 b9455e8..0000000
--- 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 2ab780e..0000000
--- 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 c7c79e9..0000000
--- 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 e7dad89..0000000
--- 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 958ad21..0000000
--- 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 051e546..0000000
--- 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 233160f..0000000
--- 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 2688c48..0000000
--- 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 00da452..0000000
--- 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 f60f539..0000000
--- 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 0b6cbf2..0000000
--- 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 c0e9e6e..0000000
--- 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 d1e22c6..0000000
--- 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 ed9ea87..0000000
--- 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 f5f8822..0000000
--- 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 d15cc9b..0000000
--- 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 3d1d696..0000000
--- 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 db13bc3..0000000
--- 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 9ae8410..0000000
--- 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 4c5669f..0000000
--- 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 5946803..0000000
--- 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 78a8a0d..0000000
--- 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 0a8ea15..0000000
--- 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 d10f12a..0000000
--- 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 2f625a9..0000000
--- 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 cc7bf78..0000000
--- 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 9015123..0000000
--- 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 4e3dffd..0000000
--- 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 93431f4..0000000
--- 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 a69ed71..0000000
--- 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 789d653..0000000
--- 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 023602b..0000000
--- 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 61c97db..0000000
--- 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 64f41248..0000000
--- 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 6c3a9cb..0000000
--- 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 05ce6ab..0000000
--- 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 40c4904984..0000000
--- 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 4a02098..0000000
--- 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 a7d0dd3..0000000
--- 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 91c1873..0000000
--- 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 467aeca..0000000
--- 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 d01a929..0000000
--- 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 f78c9a8..0000000
--- 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 c5dcb45..0000000
--- 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 78da1ff..0000000
--- 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 64c07a7..0000000
--- 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 5faeb7e..0000000
--- 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 7ebda33..0000000
--- 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 f284357..0000000
--- 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 3799c67..0000000
--- 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 e9dfe39..0000000
--- 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 4875520..0000000
--- 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 bf32d51..0000000
--- 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 52fe009..0000000
--- 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 a190297..0000000
--- 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 a7c3edd..0000000
--- 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 1460c67..0000000
--- 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 96c7bbe..0000000
--- 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 aaee3d2..0000000
--- 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 bb7385b..0000000
--- 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 c6e595e..0000000
--- 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 0a28e18..0000000
--- 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 4f326a1..0000000
--- 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 3cb61ac..0000000
--- 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 85f92ce..0000000
--- 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 26c1c32..0000000
--- 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 ba735f5..0000000
--- 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 d5dccf7..0000000
--- 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 aaa771b..0000000
--- 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 3b77117..0000000
--- 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 38555ce..0000000
--- 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 85ffa61..0000000
--- 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 55c505f..0000000
--- 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 d6c37a6..0000000
--- 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 7f0fa9b..0000000
--- 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 9e525af..0000000
--- 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 a45d21c..0000000
--- 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 557eaf8..0000000
--- 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 cb7343e..0000000
--- 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 0b287bf..0000000
--- 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 87ba884..0000000
--- 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 fd2a75b..0000000
--- 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 25557ed..0000000
--- 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 a183778..0000000
--- 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 fc0634f..0000000
--- 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 1ebf08d..0000000
--- 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 eef79d9..0000000
--- 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 6332980..0000000
--- 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 a61a143..0000000
--- 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 67c6f3e..0000000
--- 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 57e8696..0000000
--- 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 557e362..0000000
--- 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 88baa86..0000000
--- 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 22f3717..0000000
--- 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 e7a6339..0000000
--- 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 44be0a2..0000000
--- 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 961bd61..0000000
--- 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 dda1b56..0000000
--- 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 43e70ef..0000000
--- 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 8e28ce66..0000000
--- 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 f927f60..0000000
--- 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 914a749..0000000
--- 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 9a11071..0000000
--- 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 5136eff..0000000
--- 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 bc0beb5..0000000
--- 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 360d38f..0000000
--- 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 32abefb..0000000
--- 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 15561e0..0000000
--- 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 5373b5e..0000000
--- 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 0744cdb..0000000
--- 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 f782f52..0000000
--- 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 3f80eaa..0000000
--- 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 149ba05..0000000
--- 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 393cbd8..0000000
--- 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 2e69f37..0000000
--- 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 618add7..0000000
--- 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 b9cf22b..0000000
--- 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 1b7e925..0000000
--- 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 0c1dffa..0000000
--- 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 e76b441..0000000
--- 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 10caa23..0000000
--- 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 de40469..0000000
--- 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 4ab9d60..0000000
--- 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 ddb0143..0000000
--- 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 269a6b0..0000000
--- 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 9276e12..0000000
--- 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 9311531..0000000
--- 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 ea42e70..0000000
--- 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 40548c7..0000000
--- 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 d781837..0000000
--- 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 cac4c62..0000000
--- 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 fa1d8f3..0000000
--- 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 ca5e236..0000000
--- 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 bd4ba81..0000000
--- 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 a9723ed..0000000
--- 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 6a4adf1..0000000
--- 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 f6496f2..0000000
--- 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 69c4873..0000000
--- 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 cabaa9a..0000000
--- 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 23cacbd..0000000
--- 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 7a8ecf9..0000000
--- 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 c93ffaa..0000000
--- 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 f25bacb..0000000
--- 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 b5f0b4f..0000000
--- 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 638907d..0000000
--- 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 7691f73..0000000
--- 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 6d95f21..0000000
--- 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 3cc0ad3..0000000
--- 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 50ae2e6..0000000
--- 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 4c007a6..0000000
--- 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 2c46bc3..0000000
--- 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 b5e3ff0..0000000
--- 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 f28ee1c..0000000
--- 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 ca71054..0000000
--- 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 97d7f92..0000000
--- 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 d2bb02c..0000000
--- 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 eef1631..0000000
--- 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 787bec5..0000000
--- 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 20506f2..0000000
--- 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 c48e01a..0000000
--- 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 c74b465..0000000
--- 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 54bf586..0000000
--- 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 ca18145..0000000
--- 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 1d721be..0000000
--- 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 28c7aae..0000000
--- 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 24f719d..0000000
--- 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 3777316..0000000
--- 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 368c1c1..0000000
--- 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 2448be5..0000000
--- 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 3450d51..0000000
--- 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 e1d406e..0000000
--- 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 a8a7284..0000000
--- 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 4afab11..0000000
--- 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 aae4776..0000000
--- 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 cba2728..0000000
--- 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 0dea9b5..0000000
--- 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 1778342..0000000
--- 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 154f161..0000000
--- 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 27d7a8f..0000000
--- 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 d4b8c92..0000000
--- 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 33890b7..0000000
--- 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 f348429..0000000
--- 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 0320080..0000000
--- 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 55498f7..0000000
--- 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 63b544e..0000000
--- 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 b7eb950..0000000
--- 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 a41a26e..0000000
--- 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 6fc2b4e..0000000
--- 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 26e8347..0000000
--- 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 de14e94..0000000
--- 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 aabc118..0000000
--- 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 7f6552e..0000000
--- 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 6606a80..0000000
--- 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 2285aab..0000000
--- 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 af573b76..0000000
--- 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 9cb1b2a..0000000
--- 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 8673727..0000000
--- 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 04b1f43..0000000
--- 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 2537dcb..0000000
--- 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 0095f99..0000000
--- 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 1c12778..0000000
--- 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 63f3e49..0000000
--- 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 d5631ea..0000000
--- 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 aa94377..0000000
--- 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 89722a9..0000000
--- 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 330de97..0000000
--- 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 f93bd9e..0000000
--- 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 e51016e..0000000
--- 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 0a35073..0000000
--- 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 0e8ccdd3..0000000
--- 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 a52aa51..0000000
--- 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 f64d4382..0000000
--- 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 895ee97..0000000
--- 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 8cc545c..0000000
--- 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 550da35..0000000
--- 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 ca9301f..0000000
--- 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 ba8b023..0000000
--- 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 c98609a..0000000
--- 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 fd62b3a..0000000
--- 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 52d7698..0000000
--- 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 f72efa2..0000000
--- 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 72c9a0b..0000000
--- 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 e9b8421..0000000
--- 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 8abe1f9..0000000
--- 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 a4f515f..0000000
--- 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 ed921b1..0000000
--- 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 df3ae67..0000000
--- 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 860b465..0000000
--- 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 0773c8e..0000000
--- 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 4829abd..0000000
--- 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 e55b143..0000000
--- 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 fad8ae6..0000000
--- 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 2196531..0000000
--- 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 90da042..0000000
--- 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 f71cbd6..0000000
--- 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 74ddeec..0000000
--- 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 9779230..0000000
--- 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 f02f111..0000000
--- 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 41f8cd0..0000000
--- 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 fcd4c51..0000000
--- 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 9a3d952..0000000
--- 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 9947656..0000000
--- 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 a566748..0000000
--- 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 51bf8d7..0000000
--- 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 af6ce18..0000000
--- 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 523c4c3..0000000
--- 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 1c2ae7c..0000000
--- 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 7f41988..0000000
--- 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 003fa18..0000000
--- 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 7996b7d..0000000
--- 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 f972427..0000000
--- 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 354daef..0000000
--- 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 2f586ca..0000000
--- 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 843b7ce..0000000
--- 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 f226cb5..0000000
--- 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 c07ffd9..0000000
--- 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 91f8c66..0000000
--- 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 58b8d15..0000000
--- 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 a5c79d6..0000000
--- 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 7aa01af..0000000
--- 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 998beba3..0000000
--- 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 5fed162..0000000
--- 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 8b06eab..0000000
--- 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 4c38631..0000000
--- 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 c76d853..0000000
--- 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 de0b676..0000000
--- 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 c6b25f5..0000000
--- 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 533b074..0000000
--- 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 eee06da..0000000
--- 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 eb7fabe..0000000
--- 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 6a6a184..0000000
--- 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 8271000..0000000
--- 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 a967c66..0000000
--- 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 ef3c5a4..0000000
--- 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 b433923..0000000
--- 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 5defae7..0000000
--- 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 4313531..0000000
--- 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 96b5b17..0000000
--- 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 87defb6..0000000
--- 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 7153cb0..0000000
--- 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 f65e797..0000000
--- 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 2e275d4..0000000
--- 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 d0fc7c4..0000000
--- 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 182db7b..0000000
--- 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 62e46e1..0000000
--- 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 1f8227b..0000000
--- 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 e8cac52..0000000
--- 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 5672fc9..0000000
--- 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 96bea04..0000000
--- 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 06d7647..0000000
--- 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 8e9235e..0000000
--- 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 8f46cab..0000000
--- 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 e0f4da1..0000000
--- 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 17250f7..0000000
--- 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 0b10b22..0000000
--- 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 d70f153..0000000
--- 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 b450341..0000000
--- 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 1847674..0000000
--- 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 01d9f2d..0000000
--- 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 779c034..0000000
--- 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 37249db..0000000
--- 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 aa68157..0000000
--- 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 3f4ec19..0000000
--- 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 bb4927b..0000000
--- 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 aa8e99b..0000000
--- 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 0d648bb..0000000
--- 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 e07834e..0000000
--- 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 64eec4d..0000000
--- 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 e8769c6..0000000
--- 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 88fdf88..0000000
--- 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 ae6e5c4..0000000
--- 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 8116067..0000000
--- 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 836dc9b..0000000
--- 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 1b30260..0000000
--- 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 4366939..0000000
--- 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 769c43a..0000000
--- 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 8b524bf..0000000
--- 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 4dd30fc..0000000
--- 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 bd80a46..0000000
--- 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 a54d01f..0000000
--- 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 37af8e7..0000000
--- 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 c4f4fce..0000000
--- 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 d983d80..0000000
--- 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 9ed9707..0000000
--- 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 8aa8b19..0000000
--- 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 1d7f7d7..0000000
--- 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 e6ebd89..0000000
--- 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 c34521b..0000000
--- 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 418919c..0000000
--- 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 06e09b6..0000000
--- 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 fbadf62..0000000
--- 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 9953a6b..0000000
--- 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 d1b120f..0000000
--- 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 7cfa1de..0000000
--- 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 ecf8c51..0000000
--- 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 95138bb..0000000
--- 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 523afb3..0000000
--- 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 e6c6c16..0000000
--- 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 7274ef5..0000000
--- 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 7a996e6..0000000
--- 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 e8a3f32..0000000
--- 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 bdfcc94..0000000
--- 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 074e005..0000000
--- 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 b05ed17..0000000
--- 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 171beeb..0000000
--- 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 dcefb2e..0000000
--- 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 338d0ba..0000000
--- 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 6f2b476..0000000
--- 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 6f6e535..0000000
--- 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 7757d90..0000000
--- 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 f45e713..0000000
--- 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 38c5671..0000000
--- 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 77ae763..0000000
--- 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 5dfe463..0000000
--- 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 47d07e4..0000000
--- 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 3aca583..0000000
--- 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 9101452..0000000
--- 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 7b32b17..0000000
--- 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 90ce8ad..0000000
--- 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 c0f875e..0000000
--- 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 52fd15c..0000000
--- 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 2d191a6..0000000
--- 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 a787742..0000000
--- 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 3431e28..0000000
--- 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 16733f7..0000000
--- 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 3cbe182..0000000
--- 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 9101ff1..0000000
--- 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 02abdfd..0000000
--- 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 dc35fe8..0000000
--- 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 cc61cd0..0000000
--- 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 f625e5b..0000000
--- 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 d60cda8..0000000
--- 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 7bbaac2..0000000
--- 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 40ed8ad..0000000
--- 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 350638e..0000000
--- 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 da0a221..0000000
--- 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 76ac4b4..0000000
--- 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 9f6054a..0000000
--- 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 b04adfc..0000000
--- 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 136572e..0000000
--- 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 a47eac3..0000000
--- 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 9a86ff7..0000000
--- 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:
-  virtual ::org::w3c::dom::DOMImplementation * item(jint);
-  virtual 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 e4bf94b..0000000
--- 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:
-  virtual ::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 76a759f..0000000
--- 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:
-  virtual ::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 3b09f7c..0000000
--- 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:
-  virtual ::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 7f28450..0000000
--- 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 fd8ea04..0000000
--- 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 51c78a1..0000000
--- 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 415f694..0000000
--- 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 7313ef2..0000000
--- 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 62d12a8..0000000
--- 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 77b7167..0000000
--- 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 ea502e3..0000000
--- 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 33fc8c1..0000000
--- 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 c555138..0000000
--- 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 1fa01ce..0000000
--- 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 3a11990..0000000
--- 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 fecf2fd..0000000
--- 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 b3f347b..0000000
--- 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 c95ae1c..0000000
--- 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 d5fbba2..0000000
--- 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 784d2db..0000000
--- 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 6ce5214..0000000
--- 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 a115b7f..0000000
--- 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 f4c26d7..0000000
--- 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 bc0932d..0000000
--- 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 e55d1e0..0000000
--- 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 a1c1255..0000000
--- 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 2fc9550..0000000
--- 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 7f1e90e..0000000
--- 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 20d2e8c..0000000
--- 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 8f34b35..0000000
--- 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 b46815c..0000000
--- 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 b5cdf77..0000000
--- 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 4f461f7..0000000
--- 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 2cfbf84..0000000
--- 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 01a2361..0000000
--- 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 5a53cfa..0000000
--- 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 12823e8..0000000
--- 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 1532e40..0000000
--- 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 ab34c70..0000000
--- 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 e2859b3..0000000
--- 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 7c9c16a..0000000
--- 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 1c2d48b..0000000
--- 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 06a86c9..0000000
--- 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 269d051..0000000
--- 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 f631589..0000000
--- 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 e0132bc..0000000
--- 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 223a8f6..0000000
--- 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 13f7df0..0000000
--- 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 78b7ec1..0000000
--- 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 a39953c..0000000
--- 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 3dea87f..0000000
--- 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 a87c07d..0000000
--- 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 954dc52..0000000
--- 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 3d831ab..0000000
--- 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 3e01bd2..0000000
--- 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 e8c4b10..0000000
--- 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 9a0837e..0000000
--- 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 ca09ae5..0000000
--- 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 931896b..0000000
--- 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 b6b5f5c..0000000
--- 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 dc6748f..0000000
--- 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 3b9caa3..0000000
--- 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 d0f9948..0000000
--- 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 c26a4b4..0000000
--- 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 c58f1cf..0000000
--- 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 4fdb470..0000000
--- 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 e2a6e33..0000000
--- 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 4d90bb5..0000000
--- 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 8cdbb13..0000000
--- 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 9dc4763..0000000
--- 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 e061d87..0000000
--- 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 b6ef2bc..0000000
--- 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 dbf7b4c..0000000
--- 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 ac14483..0000000
--- 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 3b4b169..0000000
--- 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 219e40d..0000000
--- 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 54ef943..0000000
--- 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 fe5201f..0000000
--- 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 b2fbcf5..0000000
--- 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 e6bf83a..0000000
--- 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 23f0818..0000000
--- 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 344f4a5..0000000
--- 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 17e37b5..0000000
--- 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 a1c143d..0000000
--- 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 5f5f9ae..0000000
--- 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 a8d59ea..0000000
--- 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 3bec0b3..0000000
--- 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 844493c..0000000
--- 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 edc4466..0000000
--- 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 4e32765..0000000
--- 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 f94da31f..0000000
--- 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 c144440..0000000
--- 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 8dd9da1..0000000
--- 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 9c63033..0000000
--- 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 6d3990e..0000000
--- 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 2f1e3f3..0000000
--- 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 8a72aaa..0000000
--- 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 2376205..0000000
--- 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 3a983eb..0000000
--- 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 11ead65..0000000
--- 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 d56e7d4..0000000
--- 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 e7a0cbe..0000000
--- 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 743989a..0000000
--- 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 50efa0f..0000000
--- 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 f758d86..0000000
--- 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 f18a57a..0000000
--- 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 92d2130..0000000
--- 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 7a8a970..0000000
--- 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 4e6cb06c..0000000
--- 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 d4c53b3..0000000
--- 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 949c567..0000000
--- 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 b5410df..0000000
--- 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 77a7eeb..0000000
--- 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 69cc4b2..0000000
--- 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 c6e25e0..0000000
--- 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 c8c5296..0000000
--- 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 2060b85..0000000
--- 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 22a7c26..0000000
--- 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 ce05a57..0000000
--- 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 816c751..0000000
--- 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 7922d25..0000000
--- 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 e07e396..0000000
--- 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 21bde82..0000000
--- 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 ddbae8e..0000000
--- 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 3ff791a..0000000
--- 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 d9736bf..0000000
--- 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 cb9e26e..0000000
--- 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 d425d98..0000000
--- 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 96d923a..0000000
--- 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 eaee940..0000000
--- 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 1005ec6..0000000
--- 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 143266a..0000000
--- 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 df6f417..0000000
--- 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 ac5fee4..0000000
--- 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 5d22ce0..0000000
--- 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 14f9246..0000000
--- 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 05b30eb..0000000
--- 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 5ad9fa5..0000000
--- 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 3a61e9d..0000000
--- 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 404ef36..0000000
--- 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 237ef66..0000000
--- 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 24ab462..0000000
--- 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 774a74a..0000000
--- 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 2fcdad8..0000000
--- 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 1c61638..0000000
--- 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 d6fbb0c..0000000
--- 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 366c455..0000000
--- 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 6f4fcda..0000000
--- 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 4d73466..0000000
--- 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 41a67ef..0000000
--- 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 5d8d35f..0000000
--- 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 afb3f6d..0000000
--- 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 ef1323e..0000000
--- 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 944e30d..0000000
--- 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 c33317b..0000000
--- 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 88d9325..0000000
--- 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 13e4960..0000000
--- 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 888b28a..0000000
--- 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 9d76f2e..0000000
--- 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 9be9aaf..0000000
--- 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__