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

94 files changed, 0 insertions, 4099 deletions

diff --git a/libjava/javax/naming/AuthenticationException.h b/libjava/javax/naming/AuthenticationException.h
deleted file mode 100644
index 9f41f0d..0000000
--- a/libjava/javax/naming/AuthenticationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_AuthenticationException__
-#define __javax_naming_AuthenticationException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class AuthenticationException;
-    }
-  }
-}
-
-class javax::naming::AuthenticationException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  AuthenticationException();
-  AuthenticationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3678497619904568096LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_AuthenticationException__
diff --git a/libjava/javax/naming/AuthenticationNotSupportedException.h b/libjava/javax/naming/AuthenticationNotSupportedException.h
deleted file mode 100644
index d55627f..0000000
--- a/libjava/javax/naming/AuthenticationNotSupportedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_AuthenticationNotSupportedException__
-#define __javax_naming_AuthenticationNotSupportedException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class AuthenticationNotSupportedException;
-    }
-  }
-}
-
-class javax::naming::AuthenticationNotSupportedException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  AuthenticationNotSupportedException();
-  AuthenticationNotSupportedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7149033933259492300LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_AuthenticationNotSupportedException__
diff --git a/libjava/javax/naming/BinaryRefAddr.h b/libjava/javax/naming/BinaryRefAddr.h
deleted file mode 100644
index b36ccbd..0000000
--- a/libjava/javax/naming/BinaryRefAddr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_BinaryRefAddr__
-#define __javax_naming_BinaryRefAddr__
-
-#pragma interface
-
-#include <javax/naming/RefAddr.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class BinaryRefAddr;
-    }
-  }
-}
-
-class javax::naming::BinaryRefAddr : public ::javax::naming::RefAddr
-{
-
-public:
-  BinaryRefAddr(::java::lang::String *, JArray< jbyte > *);
-  BinaryRefAddr(::java::lang::String *, JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::Object * getContent();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = -3415254970957330361LL;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::javax::naming::RefAddr)))) buf;
-  static JArray< jchar > * hex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_BinaryRefAddr__
diff --git a/libjava/javax/naming/Binding.h b/libjava/javax/naming/Binding.h
deleted file mode 100644
index 06522b4..0000000
--- a/libjava/javax/naming/Binding.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Binding__
-#define __javax_naming_Binding__
-
-#pragma interface
-
-#include <javax/naming/NameClassPair.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Binding;
-    }
-  }
-}
-
-class javax::naming::Binding : public ::javax::naming::NameClassPair
-{
-
-public:
-  Binding(::java::lang::String *, ::java::lang::Object *);
-  Binding(::java::lang::String *, ::java::lang::Object *, jboolean);
-  Binding(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *);
-  Binding(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::Object * getObject();
-  virtual void setObject(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8839217842691845890LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::naming::NameClassPair)))) boundObj;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_Binding__
diff --git a/libjava/javax/naming/CannotProceedException.h b/libjava/javax/naming/CannotProceedException.h
deleted file mode 100644
index 83fe1ec..0000000
--- a/libjava/javax/naming/CannotProceedException.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CannotProceedException__
-#define __javax_naming_CannotProceedException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CannotProceedException : public ::javax::naming::NamingException
-{
-
-public:
-  CannotProceedException();
-  CannotProceedException(::java::lang::String *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual void setEnvironment(::java::util::Hashtable *);
-  virtual ::javax::naming::Name * getRemainingNewName();
-  virtual void setRemainingNewName(::javax::naming::Name *);
-  virtual ::javax::naming::Name * getAltName();
-  virtual void setAltName(::javax::naming::Name *);
-  virtual ::javax::naming::Context * getAltNameCtx();
-  virtual void setAltNameCtx(::javax::naming::Context *);
-private:
-  static const jlong serialVersionUID = 1219724816191576813LL;
-public: // actually protected
-  ::javax::naming::Name * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) remainingNewName;
-  ::java::util::Hashtable * environment;
-  ::javax::naming::Name * altName;
-  ::javax::naming::Context * altNameCtx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CannotProceedException__
diff --git a/libjava/javax/naming/CommunicationException.h b/libjava/javax/naming/CommunicationException.h
deleted file mode 100644
index 1a7a118..0000000
--- a/libjava/javax/naming/CommunicationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CommunicationException__
-#define __javax_naming_CommunicationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CommunicationException;
-    }
-  }
-}
-
-class javax::naming::CommunicationException : public ::javax::naming::NamingException
-{
-
-public:
-  CommunicationException();
-  CommunicationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3618507780299986611LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CommunicationException__
diff --git a/libjava/javax/naming/CompositeName.h b/libjava/javax/naming/CompositeName.h
deleted file mode 100644
index 8669b7f..0000000
--- a/libjava/javax/naming/CompositeName.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CompositeName__
-#define __javax_naming_CompositeName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CompositeName;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CompositeName : public ::java::lang::Object
-{
-
-public:
-  CompositeName();
-public: // actually protected
-  CompositeName(::java::util::Enumeration *);
-public:
-  CompositeName(::java::lang::String *);
-  virtual ::javax::naming::Name * add(jint, ::java::lang::String *);
-  virtual ::javax::naming::Name * add(::java::lang::String *);
-  virtual ::javax::naming::Name * addAll(jint, ::javax::naming::Name *);
-  virtual ::javax::naming::Name * addAll(::javax::naming::Name *);
-  virtual ::java::lang::Object * clone();
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean endsWith(::javax::naming::Name *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * get(jint);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::javax::naming::Name * getPrefix(jint);
-  virtual ::javax::naming::Name * getSuffix(jint);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual jboolean startsWith(::javax::naming::Name *);
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 1667768148915813118LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CompositeName__
diff --git a/libjava/javax/naming/CompoundName.h b/libjava/javax/naming/CompoundName.h
deleted file mode 100644
index a28724b..0000000
--- a/libjava/javax/naming/CompoundName.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CompoundName__
-#define __javax_naming_CompoundName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CompoundName;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CompoundName : public ::java::lang::Object
-{
-
-  CompoundName(::java::util::Properties *);
-public: // actually protected
-  CompoundName(::java::util::Enumeration *, ::java::util::Properties *);
-public:
-  CompoundName(::java::lang::String *, ::java::util::Properties *);
-  virtual ::javax::naming::Name * add(jint, ::java::lang::String *);
-  virtual ::javax::naming::Name * add(::java::lang::String *);
-  virtual ::javax::naming::Name * addAll(jint, ::javax::naming::Name *);
-  virtual ::javax::naming::Name * addAll(::javax::naming::Name *);
-  virtual ::java::lang::Object * clone();
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean endsWith(::javax::naming::Name *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * get(jint);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::javax::naming::Name * getPrefix(jint);
-  virtual ::javax::naming::Name * getSuffix(jint);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual jboolean startsWith(::javax::naming::Name *);
-private:
-  ::java::lang::String * isSpecial(::java::lang::String *, jint);
-public:
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * canonicalize(::java::lang::String *);
-  void initializeSyntax();
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 3513100557083972036LL;
-public: // actually protected
-  ::java::util::Properties * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mySyntax;
-private:
-  ::java::util::Vector * elts;
-  jint direction;
-  ::java::lang::String * separator;
-  jboolean ignoreCase;
-  ::java::lang::String * escape;
-  ::java::lang::String * beginQuote;
-  ::java::lang::String * endQuote;
-  ::java::lang::String * beginQuote2;
-  ::java::lang::String * endQuote2;
-  jboolean trimBlanks;
-  static const jint RIGHT_TO_LEFT = -1;
-  static const jint LEFT_TO_RIGHT = 1;
-  static const jint FLAT = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CompoundName__
diff --git a/libjava/javax/naming/ConfigurationException.h b/libjava/javax/naming/ConfigurationException.h
deleted file mode 100644
index f59a32a..0000000
--- a/libjava/javax/naming/ConfigurationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ConfigurationException__
-#define __javax_naming_ConfigurationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ConfigurationException;
-    }
-  }
-}
-
-class javax::naming::ConfigurationException : public ::javax::naming::NamingException
-{
-
-public:
-  ConfigurationException();
-  ConfigurationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2535156726228855704LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ConfigurationException__
diff --git a/libjava/javax/naming/Context.h b/libjava/javax/naming/Context.h
deleted file mode 100644
index c5b5ed8..0000000
--- a/libjava/javax/naming/Context.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Context__
-#define __javax_naming_Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::Context : public ::java::lang::Object
-{
-
-public:
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static ::java::lang::String * INITIAL_CONTEXT_FACTORY;
-  static ::java::lang::String * OBJECT_FACTORIES;
-  static ::java::lang::String * STATE_FACTORIES;
-  static ::java::lang::String * URL_PKG_PREFIXES;
-  static ::java::lang::String * PROVIDER_URL;
-  static ::java::lang::String * DNS_URL;
-  static ::java::lang::String * AUTHORITATIVE;
-  static ::java::lang::String * BATCHSIZE;
-  static ::java::lang::String * REFERRAL;
-  static ::java::lang::String * SECURITY_PROTOCOL;
-  static ::java::lang::String * SECURITY_AUTHENTICATION;
-  static ::java::lang::String * SECURITY_PRINCIPAL;
-  static ::java::lang::String * SECURITY_CREDENTIALS;
-  static ::java::lang::String * LANGUAGE;
-  static ::java::lang::String * APPLET;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Context__
diff --git a/libjava/javax/naming/ContextNotEmptyException.h b/libjava/javax/naming/ContextNotEmptyException.h
deleted file mode 100644
index 791e89d..0000000
--- a/libjava/javax/naming/ContextNotEmptyException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ContextNotEmptyException__
-#define __javax_naming_ContextNotEmptyException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ContextNotEmptyException;
-    }
-  }
-}
-
-class javax::naming::ContextNotEmptyException : public ::javax::naming::NamingException
-{
-
-public:
-  ContextNotEmptyException();
-  ContextNotEmptyException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1090963683348219877LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ContextNotEmptyException__
diff --git a/libjava/javax/naming/InitialContext.h b/libjava/javax/naming/InitialContext.h
deleted file mode 100644
index 6eaac2e..0000000
--- a/libjava/javax/naming/InitialContext.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InitialContext__
-#define __javax_naming_InitialContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class InitialContext;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::InitialContext : public ::java::lang::Object
-{
-
-public:
-  InitialContext(::java::util::Hashtable *);
-public: // actually protected
-  InitialContext(jboolean);
-public:
-  InitialContext();
-public: // actually protected
-  virtual void init(::java::util::Hashtable *);
-public: // actually package-private
-  static void merge(::java::util::Hashtable *, ::java::util::Hashtable *);
-public: // actually protected
-  virtual ::javax::naming::Context * getDefaultInitCtx();
-  virtual ::javax::naming::Context * getURLOrDefaultInitCtx(::javax::naming::Name *);
-  virtual ::javax::naming::Context * getURLOrDefaultInitCtx(::java::lang::String *);
-public:
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookup(::java::lang::String *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *);
-  virtual void unbind(::javax::naming::Name *);
-  virtual void unbind(::java::lang::String *);
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual void rename(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *);
-  virtual void destroySubcontext(::javax::naming::Name *);
-  virtual void destroySubcontext(::java::lang::String *);
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *);
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *);
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *);
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *);
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *);
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual void close();
-  virtual ::java::lang::String * getNameInNamespace();
-public: // actually protected
-  ::javax::naming::Context * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultInitCtx;
-  jboolean gotDefault;
-  ::java::util::Hashtable * myProps;
-public: // actually package-private
-  static ::java::util::HashSet * colon_list;
-  static JArray< ::java::lang::String * > * use_properties;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InitialContext__
diff --git a/libjava/javax/naming/InsufficientResourcesException.h b/libjava/javax/naming/InsufficientResourcesException.h
deleted file mode 100644
index d3fc660..0000000
--- a/libjava/javax/naming/InsufficientResourcesException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InsufficientResourcesException__
-#define __javax_naming_InsufficientResourcesException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InsufficientResourcesException;
-    }
-  }
-}
-
-class javax::naming::InsufficientResourcesException : public ::javax::naming::NamingException
-{
-
-public:
-  InsufficientResourcesException();
-  InsufficientResourcesException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6227672693037844532LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InsufficientResourcesException__
diff --git a/libjava/javax/naming/InterruptedNamingException.h b/libjava/javax/naming/InterruptedNamingException.h
deleted file mode 100644
index f13b87b..0000000
--- a/libjava/javax/naming/InterruptedNamingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InterruptedNamingException__
-#define __javax_naming_InterruptedNamingException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InterruptedNamingException;
-    }
-  }
-}
-
-class javax::naming::InterruptedNamingException : public ::javax::naming::NamingException
-{
-
-public:
-  InterruptedNamingException();
-  InterruptedNamingException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6404516648893194728LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InterruptedNamingException__
diff --git a/libjava/javax/naming/InvalidNameException.h b/libjava/javax/naming/InvalidNameException.h
deleted file mode 100644
index 47e1757..0000000
--- a/libjava/javax/naming/InvalidNameException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InvalidNameException__
-#define __javax_naming_InvalidNameException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InvalidNameException;
-    }
-  }
-}
-
-class javax::naming::InvalidNameException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidNameException();
-  InvalidNameException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8370672380823801105LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InvalidNameException__
diff --git a/libjava/javax/naming/LimitExceededException.h b/libjava/javax/naming/LimitExceededException.h
deleted file mode 100644
index f6d6fda..0000000
--- a/libjava/javax/naming/LimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LimitExceededException__
-#define __javax_naming_LimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LimitExceededException;
-    }
-  }
-}
-
-class javax::naming::LimitExceededException : public ::javax::naming::NamingException
-{
-
-public:
-  LimitExceededException();
-  LimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -776898738660207856LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LimitExceededException__
diff --git a/libjava/javax/naming/LinkException.h b/libjava/javax/naming/LinkException.h
deleted file mode 100644
index 9949157..0000000
--- a/libjava/javax/naming/LinkException.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkException__
-#define __javax_naming_LinkException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkException;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::LinkException : public ::javax::naming::NamingException
-{
-
-public:
-  LinkException();
-  LinkException(::java::lang::String *);
-  virtual ::javax::naming::Name * getLinkResolvedName();
-  virtual ::javax::naming::Name * getLinkRemainingName();
-  virtual ::java::lang::Object * getLinkResolvedObj();
-  virtual ::java::lang::String * getLinkExplanation();
-  virtual void setLinkExplanation(::java::lang::String *);
-  virtual void setLinkResolvedName(::javax::naming::Name *);
-  virtual void setLinkRemainingName(::javax::naming::Name *);
-  virtual void setLinkResolvedObj(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jboolean);
-private:
-  static const jlong serialVersionUID = -7967662604076777712LL;
-public: // actually protected
-  ::javax::naming::Name * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) linkResolvedName;
-  ::java::lang::Object * linkResolvedObj;
-  ::javax::naming::Name * linkRemainingName;
-  ::java::lang::String * linkExplanation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkException__
diff --git a/libjava/javax/naming/LinkLoopException.h b/libjava/javax/naming/LinkLoopException.h
deleted file mode 100644
index 4ca06dd..0000000
--- a/libjava/javax/naming/LinkLoopException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkLoopException__
-#define __javax_naming_LinkLoopException__
-
-#pragma interface
-
-#include <javax/naming/LinkException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkLoopException;
-    }
-  }
-}
-
-class javax::naming::LinkLoopException : public ::javax::naming::LinkException
-{
-
-public:
-  LinkLoopException();
-  LinkLoopException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3119189944325198009LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkLoopException__
diff --git a/libjava/javax/naming/LinkRef.h b/libjava/javax/naming/LinkRef.h
deleted file mode 100644
index 3ef79dc..0000000
--- a/libjava/javax/naming/LinkRef.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkRef__
-#define __javax_naming_LinkRef__
-
-#pragma interface
-
-#include <javax/naming/Reference.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkRef;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::LinkRef : public ::javax::naming::Reference
-{
-
-public:
-  LinkRef(::javax::naming::Name *);
-  LinkRef(::java::lang::String *);
-  virtual ::java::lang::String * getLinkName();
-private:
-  static const jlong serialVersionUID = -5386290613498931298LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkRef__
diff --git a/libjava/javax/naming/MalformedLinkException.h b/libjava/javax/naming/MalformedLinkException.h
deleted file mode 100644
index 982cf90..0000000
--- a/libjava/javax/naming/MalformedLinkException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_MalformedLinkException__
-#define __javax_naming_MalformedLinkException__
-
-#pragma interface
-
-#include <javax/naming/LinkException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class MalformedLinkException;
-    }
-  }
-}
-
-class javax::naming::MalformedLinkException : public ::javax::naming::LinkException
-{
-
-public:
-  MalformedLinkException();
-  MalformedLinkException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3066740437737830242LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_MalformedLinkException__
diff --git a/libjava/javax/naming/Name.h b/libjava/javax/naming/Name.h
deleted file mode 100644
index 4a4dd99..0000000
--- a/libjava/javax/naming/Name.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Name__
-#define __javax_naming_Name__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-    }
-  }
-}
-
-class javax::naming::Name : public ::java::lang::Object
-{
-
-public:
-  virtual jint size() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Enumeration * getAll() = 0;
-  virtual ::java::lang::String * get(jint) = 0;
-  virtual ::javax::naming::Name * getPrefix(jint) = 0;
-  virtual ::javax::naming::Name * getSuffix(jint) = 0;
-  virtual ::javax::naming::Name * add(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * add(jint, ::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * addAll(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Name * addAll(jint, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * remove(jint) = 0;
-  virtual jboolean startsWith(::javax::naming::Name *) = 0;
-  virtual jboolean endsWith(::javax::naming::Name *) = 0;
-  virtual jint compareTo(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static const jlong serialVersionUID = -3617482732056931635LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Name__
diff --git a/libjava/javax/naming/NameAlreadyBoundException.h b/libjava/javax/naming/NameAlreadyBoundException.h
deleted file mode 100644
index dd6a952..0000000
--- a/libjava/javax/naming/NameAlreadyBoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameAlreadyBoundException__
-#define __javax_naming_NameAlreadyBoundException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameAlreadyBoundException;
-    }
-  }
-}
-
-class javax::naming::NameAlreadyBoundException : public ::javax::naming::NamingException
-{
-
-public:
-  NameAlreadyBoundException();
-  NameAlreadyBoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8491441000356780586LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameAlreadyBoundException__
diff --git a/libjava/javax/naming/NameClassPair.h b/libjava/javax/naming/NameClassPair.h
deleted file mode 100644
index 690c31e..0000000
--- a/libjava/javax/naming/NameClassPair.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameClassPair__
-#define __javax_naming_NameClassPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameClassPair;
-    }
-  }
-}
-
-class javax::naming::NameClassPair : public ::java::lang::Object
-{
-
-public:
-  NameClassPair(::java::lang::String *, ::java::lang::String *);
-  NameClassPair(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getName();
-  virtual jboolean isRelative();
-  virtual void setClassName(::java::lang::String *);
-  virtual void setName(::java::lang::String *);
-  virtual void setRelative(jboolean);
-  virtual void setNameInNamespace(::java::lang::String *);
-  virtual ::java::lang::String * getNameInNamespace();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5620776610160863339LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * className;
-  jboolean isRel;
-  ::java::lang::String * fullName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameClassPair__
diff --git a/libjava/javax/naming/NameNotFoundException.h b/libjava/javax/naming/NameNotFoundException.h
deleted file mode 100644
index 079d5a0..0000000
--- a/libjava/javax/naming/NameNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameNotFoundException__
-#define __javax_naming_NameNotFoundException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameNotFoundException;
-    }
-  }
-}
-
-class javax::naming::NameNotFoundException : public ::javax::naming::NamingException
-{
-
-public:
-  NameNotFoundException();
-  NameNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8007156725367842053LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameNotFoundException__
diff --git a/libjava/javax/naming/NameParser.h b/libjava/javax/naming/NameParser.h
deleted file mode 100644
index 502fcae..0000000
--- a/libjava/javax/naming/NameParser.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameParser__
-#define __javax_naming_NameParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NameParser;
-    }
-  }
-}
-
-class javax::naming::NameParser : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Name * parse(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_NameParser__
diff --git a/libjava/javax/naming/NamingEnumeration.h b/libjava/javax/naming/NamingEnumeration.h
deleted file mode 100644
index 7d848ce..0000000
--- a/libjava/javax/naming/NamingEnumeration.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingEnumeration__
-#define __javax_naming_NamingEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::NamingEnumeration : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * next() = 0;
-  virtual jboolean hasMore() = 0;
-  virtual void close() = 0;
-  virtual jboolean hasMoreElements() = 0;
-  virtual ::java::lang::Object * nextElement() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_NamingEnumeration__
diff --git a/libjava/javax/naming/NamingException.h b/libjava/javax/naming/NamingException.h
deleted file mode 100644
index 75a5ae9..0000000
--- a/libjava/javax/naming/NamingException.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingException__
-#define __javax_naming_NamingException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NamingException;
-    }
-  }
-}
-
-class javax::naming::NamingException : public ::java::lang::Exception
-{
-
-public:
-  NamingException();
-  NamingException(::java::lang::String *);
-  virtual ::java::lang::Throwable * getRootCause();
-  virtual void setRootCause(::java::lang::Throwable *);
-  virtual ::javax::naming::Name * getResolvedName();
-  virtual void setResolvedName(::javax::naming::Name *);
-  virtual ::java::lang::Object * getResolvedObj();
-  virtual void setResolvedObj(::java::lang::Object *);
-  virtual ::javax::naming::Name * getRemainingName();
-  virtual void setRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingComponent(::java::lang::String *);
-  virtual ::java::lang::String * getExplanation();
-  virtual ::java::lang::String * toString(jboolean);
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = -1299181962103167177LL;
-public: // actually protected
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) rootException;
-  ::javax::naming::Name * resolvedName;
-  ::java::lang::Object * resolvedObj;
-  ::javax::naming::Name * remainingName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NamingException__
diff --git a/libjava/javax/naming/NamingSecurityException.h b/libjava/javax/naming/NamingSecurityException.h
deleted file mode 100644
index e2e2a49..0000000
--- a/libjava/javax/naming/NamingSecurityException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingSecurityException__
-#define __javax_naming_NamingSecurityException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingSecurityException;
-    }
-  }
-}
-
-class javax::naming::NamingSecurityException : public ::javax::naming::NamingException
-{
-
-public:
-  NamingSecurityException();
-  NamingSecurityException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5855287647294685775LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NamingSecurityException__
diff --git a/libjava/javax/naming/NoInitialContextException.h b/libjava/javax/naming/NoInitialContextException.h
deleted file mode 100644
index e598071..0000000
--- a/libjava/javax/naming/NoInitialContextException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NoInitialContextException__
-#define __javax_naming_NoInitialContextException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NoInitialContextException;
-    }
-  }
-}
-
-class javax::naming::NoInitialContextException : public ::javax::naming::NamingException
-{
-
-public:
-  NoInitialContextException();
-  NoInitialContextException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3413733186901258623LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NoInitialContextException__
diff --git a/libjava/javax/naming/NoPermissionException.h b/libjava/javax/naming/NoPermissionException.h
deleted file mode 100644
index d96556d..0000000
--- a/libjava/javax/naming/NoPermissionException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NoPermissionException__
-#define __javax_naming_NoPermissionException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NoPermissionException;
-    }
-  }
-}
-
-class javax::naming::NoPermissionException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  NoPermissionException();
-  NoPermissionException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8395332708699751775LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NoPermissionException__
diff --git a/libjava/javax/naming/NotContextException.h b/libjava/javax/naming/NotContextException.h
deleted file mode 100644
index fd488ff..0000000
--- a/libjava/javax/naming/NotContextException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NotContextException__
-#define __javax_naming_NotContextException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NotContextException;
-    }
-  }
-}
-
-class javax::naming::NotContextException : public ::javax::naming::NamingException
-{
-
-public:
-  NotContextException();
-  NotContextException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 849752551644540417LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NotContextException__
diff --git a/libjava/javax/naming/OperationNotSupportedException.h b/libjava/javax/naming/OperationNotSupportedException.h
deleted file mode 100644
index 7bf8c0f..0000000
--- a/libjava/javax/naming/OperationNotSupportedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_OperationNotSupportedException__
-#define __javax_naming_OperationNotSupportedException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class OperationNotSupportedException;
-    }
-  }
-}
-
-class javax::naming::OperationNotSupportedException : public ::javax::naming::NamingException
-{
-
-public:
-  OperationNotSupportedException();
-  OperationNotSupportedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5493232822427682064LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_OperationNotSupportedException__
diff --git a/libjava/javax/naming/PartialResultException.h b/libjava/javax/naming/PartialResultException.h
deleted file mode 100644
index 9de177a..0000000
--- a/libjava/javax/naming/PartialResultException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_PartialResultException__
-#define __javax_naming_PartialResultException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class PartialResultException;
-    }
-  }
-}
-
-class javax::naming::PartialResultException : public ::javax::naming::NamingException
-{
-
-public:
-  PartialResultException();
-  PartialResultException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2572144970049426786LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_PartialResultException__
diff --git a/libjava/javax/naming/RefAddr.h b/libjava/javax/naming/RefAddr.h
deleted file mode 100644
index f124428..0000000
--- a/libjava/javax/naming/RefAddr.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_RefAddr__
-#define __javax_naming_RefAddr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class RefAddr;
-    }
-  }
-}
-
-class javax::naming::RefAddr : public ::java::lang::Object
-{
-
-public: // actually protected
-  RefAddr(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::Object * getContent() = 0;
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) addrType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_RefAddr__
diff --git a/libjava/javax/naming/Reference.h b/libjava/javax/naming/Reference.h
deleted file mode 100644
index 62325ce..0000000
--- a/libjava/javax/naming/Reference.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Reference__
-#define __javax_naming_Reference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class RefAddr;
-        class Reference;
-    }
-  }
-}
-
-class javax::naming::Reference : public ::java::lang::Object
-{
-
-public:
-  Reference(::java::lang::String *);
-  Reference(::java::lang::String *, ::javax::naming::RefAddr *);
-  Reference(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  Reference(::java::lang::String *, ::javax::naming::RefAddr *, ::java::lang::String *, ::java::lang::String *);
-  virtual void add(jint, ::javax::naming::RefAddr *);
-  virtual void add(::javax::naming::RefAddr *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-private:
-  jboolean equals(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::naming::RefAddr * get(jint);
-  virtual ::javax::naming::RefAddr * get(::java::lang::String *);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getFactoryClassLocation();
-  virtual ::java::lang::String * getFactoryClassName();
-  virtual jint hashCode();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1673475790065791735LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) addrs;
-  ::java::lang::String * classFactory;
-  ::java::lang::String * classFactoryLocation;
-  ::java::lang::String * className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_Reference__
diff --git a/libjava/javax/naming/Referenceable.h b/libjava/javax/naming/Referenceable.h
deleted file mode 100644
index a2d09b6..0000000
--- a/libjava/javax/naming/Referenceable.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Referenceable__
-#define __javax_naming_Referenceable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Reference;
-        class Referenceable;
-    }
-  }
-}
-
-class javax::naming::Referenceable : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Reference * getReference() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Referenceable__
diff --git a/libjava/javax/naming/ReferralException.h b/libjava/javax/naming/ReferralException.h
deleted file mode 100644
index 7c26d97..0000000
--- a/libjava/javax/naming/ReferralException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ReferralException__
-#define __javax_naming_ReferralException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class ReferralException;
-    }
-  }
-}
-
-class javax::naming::ReferralException : public ::javax::naming::NamingException
-{
-
-public: // actually protected
-  ReferralException();
-  ReferralException(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * getReferralInfo() = 0;
-  virtual ::javax::naming::Context * getReferralContext() = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *) = 0;
-  virtual jboolean skipReferral() = 0;
-  virtual void retryReferral() = 0;
-private:
-  static const jlong serialVersionUID = -2881363844695698876LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ReferralException__
diff --git a/libjava/javax/naming/ServiceUnavailableException.h b/libjava/javax/naming/ServiceUnavailableException.h
deleted file mode 100644
index 4f90524..0000000
--- a/libjava/javax/naming/ServiceUnavailableException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ServiceUnavailableException__
-#define __javax_naming_ServiceUnavailableException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ServiceUnavailableException;
-    }
-  }
-}
-
-class javax::naming::ServiceUnavailableException : public ::javax::naming::NamingException
-{
-
-public:
-  ServiceUnavailableException();
-  ServiceUnavailableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4996964726566773444LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ServiceUnavailableException__
diff --git a/libjava/javax/naming/SizeLimitExceededException.h b/libjava/javax/naming/SizeLimitExceededException.h
deleted file mode 100644
index d4744b1..0000000
--- a/libjava/javax/naming/SizeLimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_SizeLimitExceededException__
-#define __javax_naming_SizeLimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/LimitExceededException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class SizeLimitExceededException;
-    }
-  }
-}
-
-class javax::naming::SizeLimitExceededException : public ::javax::naming::LimitExceededException
-{
-
-public:
-  SizeLimitExceededException();
-  SizeLimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7129289564879168579LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_SizeLimitExceededException__
diff --git a/libjava/javax/naming/StringRefAddr.h b/libjava/javax/naming/StringRefAddr.h
deleted file mode 100644
index c7bd0c8..0000000
--- a/libjava/javax/naming/StringRefAddr.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_StringRefAddr__
-#define __javax_naming_StringRefAddr__
-
-#pragma interface
-
-#include <javax/naming/RefAddr.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class StringRefAddr;
-    }
-  }
-}
-
-class javax::naming::StringRefAddr : public ::javax::naming::RefAddr
-{
-
-public:
-  StringRefAddr(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * getContent();
-private:
-  static const jlong serialVersionUID = -8913762495138505527LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::naming::RefAddr)))) contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_StringRefAddr__
diff --git a/libjava/javax/naming/TimeLimitExceededException.h b/libjava/javax/naming/TimeLimitExceededException.h
deleted file mode 100644
index 4c555fb..0000000
--- a/libjava/javax/naming/TimeLimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_TimeLimitExceededException__
-#define __javax_naming_TimeLimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/LimitExceededException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class TimeLimitExceededException;
-    }
-  }
-}
-
-class javax::naming::TimeLimitExceededException : public ::javax::naming::LimitExceededException
-{
-
-public:
-  TimeLimitExceededException();
-  TimeLimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3597009011385034696LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_TimeLimitExceededException__
diff --git a/libjava/javax/naming/directory/Attribute.h b/libjava/javax/naming/directory/Attribute.h
deleted file mode 100644
index 4c8a92d2..0000000
--- a/libjava/javax/naming/directory/Attribute.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_Attribute__
-#define __javax_naming_directory_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class DirContext;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::Attribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::NamingEnumeration * getAll() = 0;
-  virtual ::java::lang::Object * get() = 0;
-  virtual jint size() = 0;
-  virtual ::java::lang::String * getID() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual void clear() = 0;
-  virtual ::javax::naming::directory::DirContext * getAttributeSyntaxDefinition() = 0;
-  virtual ::javax::naming::directory::DirContext * getAttributeDefinition() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean isOrdered() = 0;
-  virtual ::java::lang::Object * get(jint) = 0;
-  virtual ::java::lang::Object * remove(jint) = 0;
-  virtual void add(jint, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *) = 0;
-  static const jlong serialVersionUID = 8707690322213556804LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_Attribute__
diff --git a/libjava/javax/naming/directory/AttributeInUseException.h b/libjava/javax/naming/directory/AttributeInUseException.h
deleted file mode 100644
index 5062ab5..0000000
--- a/libjava/javax/naming/directory/AttributeInUseException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_AttributeInUseException__
-#define __javax_naming_directory_AttributeInUseException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class AttributeInUseException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::AttributeInUseException : public ::javax::naming::NamingException
-{
-
-public:
-  AttributeInUseException();
-  AttributeInUseException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4437710305529322564LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_AttributeInUseException__
diff --git a/libjava/javax/naming/directory/AttributeModificationException.h b/libjava/javax/naming/directory/AttributeModificationException.h
deleted file mode 100644
index e113e32..0000000
--- a/libjava/javax/naming/directory/AttributeModificationException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_AttributeModificationException__
-#define __javax_naming_directory_AttributeModificationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class AttributeModificationException;
-          class ModificationItem;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::AttributeModificationException : public ::javax::naming::NamingException
-{
-
-public:
-  AttributeModificationException();
-  AttributeModificationException(::java::lang::String *);
-  virtual void setUnexecutedModifications(JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual JArray< ::javax::naming::directory::ModificationItem * > * getUnexecutedModifications();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8060676069678710186LL;
-  JArray< ::javax::naming::directory::ModificationItem * > * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) unexecs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_AttributeModificationException__
diff --git a/libjava/javax/naming/directory/Attributes.h b/libjava/javax/naming/directory/Attributes.h
deleted file mode 100644
index 31525e1..0000000
--- a/libjava/javax/naming/directory/Attributes.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_Attributes__
-#define __javax_naming_directory_Attributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class Attributes;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::Attributes : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isCaseIgnored() = 0;
-  virtual jint size() = 0;
-  virtual ::javax::naming::directory::Attribute * get(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * getAll() = 0;
-  virtual ::javax::naming::NamingEnumeration * getIDs() = 0;
-  virtual ::javax::naming::directory::Attribute * put(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::javax::naming::directory::Attribute * put(::javax::naming::directory::Attribute *) = 0;
-  virtual ::javax::naming::directory::Attribute * remove(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_Attributes__
diff --git a/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h b/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h
deleted file mode 100644
index df2a00d..0000000
--- a/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
-#define __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class BasicAttribute;
-          class BasicAttribute$BasicAttributeEnumeration;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttribute$BasicAttributeEnumeration : public ::java::lang::Object
-{
-
-public:
-  BasicAttribute$BasicAttributeEnumeration(::javax::naming::directory::BasicAttribute *);
-  virtual void close();
-  virtual jboolean hasMore();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) where;
-  ::javax::naming::directory::BasicAttribute * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
diff --git a/libjava/javax/naming/directory/BasicAttribute.h b/libjava/javax/naming/directory/BasicAttribute.h
deleted file mode 100644
index 2d56a62..0000000
--- a/libjava/javax/naming/directory/BasicAttribute.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttribute__
-#define __javax_naming_directory_BasicAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class BasicAttribute;
-          class DirContext;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttribute : public ::java::lang::Object
-{
-
-  BasicAttribute();
-public:
-  BasicAttribute(::java::lang::String *);
-  BasicAttribute(::java::lang::String *, jboolean);
-  BasicAttribute(::java::lang::String *, ::java::lang::Object *);
-  BasicAttribute(::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get();
-  virtual ::java::lang::Object * get(jint);
-  virtual ::javax::naming::NamingEnumeration * getAll();
-  virtual ::javax::naming::directory::DirContext * getAttributeDefinition();
-  virtual ::javax::naming::directory::DirContext * getAttributeSyntaxDefinition();
-  virtual ::java::lang::String * getID();
-  virtual jint hashCode();
-  virtual jboolean isOrdered();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 6743528196119291326LL;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrID;
-  jboolean ordered;
-  ::java::util::Vector * values;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttribute__
diff --git a/libjava/javax/naming/directory/BasicAttributes$1.h b/libjava/javax/naming/directory/BasicAttributes$1.h
deleted file mode 100644
index 13478fe..0000000
--- a/libjava/javax/naming/directory/BasicAttributes$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttributes$1__
-#define __javax_naming_directory_BasicAttributes$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class BasicAttributes;
-          class BasicAttributes$1;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttributes$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicAttributes$1(::javax::naming::directory::BasicAttributes *, ::javax::naming::NamingEnumeration *);
-public:
-  virtual jboolean hasMore();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::String * BasicAttributes$1$next();
-  virtual ::java::lang::String * BasicAttributes$1$nextElement();
-  virtual void close();
-  virtual ::java::lang::Object * next();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::javax::naming::directory::BasicAttributes * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::naming::NamingEnumeration * val$attrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttributes$1__
diff --git a/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h b/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
deleted file mode 100644
index 4b787eb..0000000
--- a/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
-#define __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attribute;
-          class BasicAttributes;
-          class BasicAttributes$BasicAttributesEnumeration;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttributes$BasicAttributesEnumeration : public ::java::lang::Object
-{
-
-public:
-  BasicAttributes$BasicAttributesEnumeration(::javax::naming::directory::BasicAttributes *);
-  virtual void close();
-  virtual jboolean hasMore();
-  virtual ::javax::naming::directory::Attribute * BasicAttributes$BasicAttributesEnumeration$next();
-  virtual jboolean hasMoreElements();
-  virtual ::javax::naming::directory::Attribute * BasicAttributes$BasicAttributesEnumeration$nextElement();
-  virtual ::java::lang::Object * next();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) where;
-  ::javax::naming::directory::BasicAttributes * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
diff --git a/libjava/javax/naming/directory/BasicAttributes.h b/libjava/javax/naming/directory/BasicAttributes.h
deleted file mode 100644
index 8943672..0000000
--- a/libjava/javax/naming/directory/BasicAttributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttributes__
-#define __javax_naming_directory_BasicAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class BasicAttributes;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttributes : public ::java::lang::Object
-{
-
-public:
-  BasicAttributes();
-  BasicAttributes(jboolean);
-  BasicAttributes(::java::lang::String *, ::java::lang::Object *);
-  BasicAttributes(::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::naming::directory::Attribute * get(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * getAll();
-  virtual ::javax::naming::NamingEnumeration * getIDs();
-  virtual jint hashCode();
-  virtual jboolean isCaseIgnored();
-  virtual ::javax::naming::directory::Attribute * put(::javax::naming::directory::Attribute *);
-  virtual ::javax::naming::directory::Attribute * put(::java::lang::String *, ::java::lang::Object *);
-  virtual ::javax::naming::directory::Attribute * remove(::java::lang::String *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 4980164073184639448LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) ignoreCase;
-public: // actually package-private
-  ::java::util::Vector * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttributes__
diff --git a/libjava/javax/naming/directory/DirContext.h b/libjava/javax/naming/directory/DirContext.h
deleted file mode 100644
index 4112621..0000000
--- a/libjava/javax/naming/directory/DirContext.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_DirContext__
-#define __javax_naming_directory_DirContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::DirContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static const jint ADD_ATTRIBUTE = 1;
-  static const jint REPLACE_ATTRIBUTE = 2;
-  static const jint REMOVE_ATTRIBUTE = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_DirContext__
diff --git a/libjava/javax/naming/directory/InitialDirContext.h b/libjava/javax/naming/directory/InitialDirContext.h
deleted file mode 100644
index 6e8712e..0000000
--- a/libjava/javax/naming/directory/InitialDirContext.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InitialDirContext__
-#define __javax_naming_directory_InitialDirContext__
-
-#pragma interface
-
-#include <javax/naming/InitialContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class InitialDirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InitialDirContext : public ::javax::naming::InitialContext
-{
-
-public:
-  InitialDirContext();
-public: // actually protected
-  InitialDirContext(jboolean);
-public:
-  InitialDirContext(::java::util::Hashtable *);
-private:
-  ::javax::naming::directory::DirContext * getURLOrDefaultInitDirCtx(::javax::naming::Name *);
-  ::javax::naming::directory::DirContext * getURLOrDefaultInitDirCtx(::java::lang::String *);
-public:
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *);
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *);
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *);
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *);
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *);
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *);
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InitialDirContext__
diff --git a/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h b/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h
deleted file mode 100644
index 23c341a..0000000
--- a/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributeIdentifierException__
-#define __javax_naming_directory_InvalidAttributeIdentifierException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributeIdentifierException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributeIdentifierException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributeIdentifierException();
-  InvalidAttributeIdentifierException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9036920266322999923LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributeIdentifierException__
diff --git a/libjava/javax/naming/directory/InvalidAttributeValueException.h b/libjava/javax/naming/directory/InvalidAttributeValueException.h
deleted file mode 100644
index c8d55fe..0000000
--- a/libjava/javax/naming/directory/InvalidAttributeValueException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributeValueException__
-#define __javax_naming_directory_InvalidAttributeValueException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributeValueException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributeValueException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributeValueException();
-  InvalidAttributeValueException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8720050295499275011LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributeValueException__
diff --git a/libjava/javax/naming/directory/InvalidAttributesException.h b/libjava/javax/naming/directory/InvalidAttributesException.h
deleted file mode 100644
index 3bbb5bf..0000000
--- a/libjava/javax/naming/directory/InvalidAttributesException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributesException__
-#define __javax_naming_directory_InvalidAttributesException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributesException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributesException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributesException();
-  InvalidAttributesException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2607612850539889765LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributesException__
diff --git a/libjava/javax/naming/directory/InvalidSearchControlsException.h b/libjava/javax/naming/directory/InvalidSearchControlsException.h
deleted file mode 100644
index 5888439..0000000
--- a/libjava/javax/naming/directory/InvalidSearchControlsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidSearchControlsException__
-#define __javax_naming_directory_InvalidSearchControlsException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidSearchControlsException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidSearchControlsException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidSearchControlsException();
-  InvalidSearchControlsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5124108943352665777LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidSearchControlsException__
diff --git a/libjava/javax/naming/directory/InvalidSearchFilterException.h b/libjava/javax/naming/directory/InvalidSearchFilterException.h
deleted file mode 100644
index 5901c07..0000000
--- a/libjava/javax/naming/directory/InvalidSearchFilterException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidSearchFilterException__
-#define __javax_naming_directory_InvalidSearchFilterException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidSearchFilterException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidSearchFilterException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidSearchFilterException();
-  InvalidSearchFilterException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2902700940682875441LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidSearchFilterException__
diff --git a/libjava/javax/naming/directory/ModificationItem.h b/libjava/javax/naming/directory/ModificationItem.h
deleted file mode 100644
index faf055b..0000000
--- a/libjava/javax/naming/directory/ModificationItem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_ModificationItem__
-#define __javax_naming_directory_ModificationItem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attribute;
-          class ModificationItem;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::ModificationItem : public ::java::lang::Object
-{
-
-public:
-  ModificationItem(jint, ::javax::naming::directory::Attribute *);
-  virtual jint getModificationOp();
-  virtual ::javax::naming::directory::Attribute * getAttribute();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7573258562534746850LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) mod_op;
-  ::javax::naming::directory::Attribute * attr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_ModificationItem__
diff --git a/libjava/javax/naming/directory/NoSuchAttributeException.h b/libjava/javax/naming/directory/NoSuchAttributeException.h
deleted file mode 100644
index 501daeef..0000000
--- a/libjava/javax/naming/directory/NoSuchAttributeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_NoSuchAttributeException__
-#define __javax_naming_directory_NoSuchAttributeException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class NoSuchAttributeException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::NoSuchAttributeException : public ::javax::naming::NamingException
-{
-
-public:
-  NoSuchAttributeException();
-  NoSuchAttributeException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4836415647935888137LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_NoSuchAttributeException__
diff --git a/libjava/javax/naming/directory/SchemaViolationException.h b/libjava/javax/naming/directory/SchemaViolationException.h
deleted file mode 100644
index 444f14c..0000000
--- a/libjava/javax/naming/directory/SchemaViolationException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SchemaViolationException__
-#define __javax_naming_directory_SchemaViolationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class SchemaViolationException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SchemaViolationException : public ::javax::naming::NamingException
-{
-
-public:
-  SchemaViolationException();
-  SchemaViolationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3041762429525049663LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SchemaViolationException__
diff --git a/libjava/javax/naming/directory/SearchControls.h b/libjava/javax/naming/directory/SearchControls.h
deleted file mode 100644
index 1c39ba8..0000000
--- a/libjava/javax/naming/directory/SearchControls.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SearchControls__
-#define __javax_naming_directory_SearchControls__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SearchControls : public ::java::lang::Object
-{
-
-public:
-  SearchControls();
-  SearchControls(jint, jlong, jint, JArray< ::java::lang::String * > *, jboolean, jboolean);
-  virtual jint getSearchScope();
-  virtual jint getTimeLimit();
-  virtual jboolean getDerefLinkFlag();
-  virtual jboolean getReturningObjFlag();
-  virtual jlong getCountLimit();
-  virtual JArray< ::java::lang::String * > * getReturningAttributes();
-  virtual void setSearchScope(jint);
-  virtual void setTimeLimit(jint);
-  virtual void setDerefLinkFlag(jboolean);
-  virtual void setReturningObjFlag(jboolean);
-  virtual void setCountLimit(jlong);
-  virtual void setReturningAttributes(JArray< ::java::lang::String * > *);
-private:
-  static const jlong serialVersionUID = -2480540967773454797LL;
-public:
-  static const jint OBJECT_SCOPE = 0;
-  static const jint ONELEVEL_SCOPE = 1;
-  static const jint SUBTREE_SCOPE = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) searchScope;
-  jint timeLimit;
-  jboolean derefLink;
-  jboolean returnObj;
-  jlong countLimit;
-  JArray< ::java::lang::String * > * attributesToReturn;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SearchControls__
diff --git a/libjava/javax/naming/directory/SearchResult.h b/libjava/javax/naming/directory/SearchResult.h
deleted file mode 100644
index ac89020..0000000
--- a/libjava/javax/naming/directory/SearchResult.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SearchResult__
-#define __javax_naming_directory_SearchResult__
-
-#pragma interface
-
-#include <javax/naming/Binding.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attributes;
-          class SearchResult;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SearchResult : public ::javax::naming::Binding
-{
-
-public:
-  SearchResult(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  SearchResult(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *, jboolean);
-  SearchResult(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  SearchResult(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *, jboolean);
-  virtual ::javax::naming::directory::Attributes * getAttributes();
-  virtual void setAttributes(::javax::naming::directory::Attributes *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -9158063327699723172LL;
-  ::javax::naming::directory::Attributes * __attribute__((aligned(__alignof__( ::javax::naming::Binding)))) attrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SearchResult__
diff --git a/libjava/javax/naming/event/EventContext.h b/libjava/javax/naming/event/EventContext.h
deleted file mode 100644
index 3fbbfc2..0000000
--- a/libjava/javax/naming/event/EventContext.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_EventContext__
-#define __javax_naming_event_EventContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace event
-      {
-          class EventContext;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::EventContext : public ::java::lang::Object
-{
-
-public:
-  virtual void addNamingListener(::javax::naming::Name *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void removeNamingListener(::javax::naming::event::NamingListener *) = 0;
-  virtual jboolean targetMustExist() = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static const jint OBJECT_SCOPE = 0;
-  static const jint ONELEVEL_SCOPE = 1;
-  static const jint SUBTREE_SCOPE = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_EventContext__
diff --git a/libjava/javax/naming/event/EventDirContext.h b/libjava/javax/naming/event/EventDirContext.h
deleted file mode 100644
index 2efa0c2..0000000
--- a/libjava/javax/naming/event/EventDirContext.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_EventDirContext__
-#define __javax_naming_event_EventDirContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-      namespace event
-      {
-          class EventDirContext;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::EventDirContext : public ::java::lang::Object
-{
-
-public:
-  virtual void addNamingListener(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::javax::naming::Name *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void removeNamingListener(::javax::naming::event::NamingListener *) = 0;
-  virtual jboolean targetMustExist() = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_EventDirContext__
diff --git a/libjava/javax/naming/event/NamespaceChangeListener.h b/libjava/javax/naming/event/NamespaceChangeListener.h
deleted file mode 100644
index e34f186..0000000
--- a/libjava/javax/naming/event/NamespaceChangeListener.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamespaceChangeListener__
-#define __javax_naming_event_NamespaceChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamespaceChangeListener;
-          class NamingEvent;
-          class NamingExceptionEvent;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamespaceChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void objectAdded(::javax::naming::event::NamingEvent *) = 0;
-  virtual void objectRemoved(::javax::naming::event::NamingEvent *) = 0;
-  virtual void objectRenamed(::javax::naming::event::NamingEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_NamespaceChangeListener__
diff --git a/libjava/javax/naming/event/NamingEvent.h b/libjava/javax/naming/event/NamingEvent.h
deleted file mode 100644
index aad8b0e..0000000
--- a/libjava/javax/naming/event/NamingEvent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingEvent__
-#define __javax_naming_event_NamingEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Binding;
-      namespace event
-      {
-          class EventContext;
-          class NamingEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingEvent : public ::java::util::EventObject
-{
-
-public:
-  NamingEvent(::javax::naming::event::EventContext *, jint, ::javax::naming::Binding *, ::javax::naming::Binding *, ::java::lang::Object *);
-  virtual jint getType();
-  virtual ::javax::naming::event::EventContext * getEventContext();
-  virtual ::javax::naming::Binding * getOldBinding();
-  virtual ::javax::naming::Binding * getNewBinding();
-  virtual ::java::lang::Object * getChangeInfo();
-  virtual void dispatch(::javax::naming::event::NamingListener *);
-private:
-  static const jlong serialVersionUID = -7126752885365133499LL;
-public:
-  static const jint OBJECT_ADDED = 0;
-  static const jint OBJECT_REMOVED = 1;
-  static const jint OBJECT_RENAMED = 2;
-  static const jint OBJECT_CHANGED = 3;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) changeInfo;
-  jint type;
-  ::javax::naming::Binding * oldBinding;
-  ::javax::naming::Binding * newBinding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_event_NamingEvent__
diff --git a/libjava/javax/naming/event/NamingExceptionEvent.h b/libjava/javax/naming/event/NamingExceptionEvent.h
deleted file mode 100644
index 9aee3c5..0000000
--- a/libjava/javax/naming/event/NamingExceptionEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingExceptionEvent__
-#define __javax_naming_event_NamingExceptionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingException;
-      namespace event
-      {
-          class EventContext;
-          class NamingExceptionEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingExceptionEvent : public ::java::util::EventObject
-{
-
-public:
-  NamingExceptionEvent(::javax::naming::event::EventContext *, ::javax::naming::NamingException *);
-  virtual ::javax::naming::NamingException * getException();
-  virtual ::javax::naming::event::EventContext * getEventContext();
-  virtual void dispatch(::javax::naming::event::NamingListener *);
-private:
-  static const jlong serialVersionUID = -4877678086134736336LL;
-  ::javax::naming::NamingException * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_event_NamingExceptionEvent__
diff --git a/libjava/javax/naming/event/NamingListener.h b/libjava/javax/naming/event/NamingListener.h
deleted file mode 100644
index d7eb003..0000000
--- a/libjava/javax/naming/event/NamingListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingListener__
-#define __javax_naming_event_NamingListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingExceptionEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingListener : public ::java::lang::Object
-{
-
-public:
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_NamingListener__
diff --git a/libjava/javax/naming/event/ObjectChangeListener.h b/libjava/javax/naming/event/ObjectChangeListener.h
deleted file mode 100644
index eaff319..0000000
--- a/libjava/javax/naming/event/ObjectChangeListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_ObjectChangeListener__
-#define __javax_naming_event_ObjectChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingEvent;
-          class NamingExceptionEvent;
-          class ObjectChangeListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::ObjectChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void objectChanged(::javax::naming::event::NamingEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_ObjectChangeListener__
diff --git a/libjava/javax/naming/ldap/Control.h b/libjava/javax/naming/ldap/Control.h
deleted file mode 100644
index 0a3f9f6..0000000
--- a/libjava/javax/naming/ldap/Control.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_Control__
-#define __javax_naming_ldap_Control__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::Control : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual jboolean isCritical() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  static const jboolean CRITICAL = 1;
-  static const jboolean NONCRITICAL = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_Control__
diff --git a/libjava/javax/naming/ldap/ControlFactory.h b/libjava/javax/naming/ldap/ControlFactory.h
deleted file mode 100644
index 404e22f..0000000
--- a/libjava/javax/naming/ldap/ControlFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ControlFactory__
-#define __javax_naming_ldap_ControlFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace ldap
-      {
-          class Control;
-          class ControlFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ControlFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  ControlFactory();
-public:
-  virtual ::javax::naming::ldap::Control * getControlInstance(::javax::naming::ldap::Control *) = 0;
-  static ::javax::naming::ldap::Control * getControlInstance(::javax::naming::ldap::Control *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_ControlFactory__
diff --git a/libjava/javax/naming/ldap/ExtendedRequest.h b/libjava/javax/naming/ldap/ExtendedRequest.h
deleted file mode 100644
index f97e66b..0000000
--- a/libjava/javax/naming/ldap/ExtendedRequest.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ExtendedRequest__
-#define __javax_naming_ldap_ExtendedRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedRequest;
-          class ExtendedResponse;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ExtendedRequest : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  virtual ::javax::naming::ldap::ExtendedResponse * createExtendedResponse(::java::lang::String *, JArray< jbyte > *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_ExtendedRequest__
diff --git a/libjava/javax/naming/ldap/ExtendedResponse.h b/libjava/javax/naming/ldap/ExtendedResponse.h
deleted file mode 100644
index cb985fe..0000000
--- a/libjava/javax/naming/ldap/ExtendedResponse.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ExtendedResponse__
-#define __javax_naming_ldap_ExtendedResponse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedResponse;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ExtendedResponse : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_ExtendedResponse__
diff --git a/libjava/javax/naming/ldap/HasControls.h b/libjava/javax/naming/ldap/HasControls.h
deleted file mode 100644
index 616b3b9..0000000
--- a/libjava/javax/naming/ldap/HasControls.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_HasControls__
-#define __javax_naming_ldap_HasControls__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-          class HasControls;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::HasControls : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::naming::ldap::Control * > * getControls() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_HasControls__
diff --git a/libjava/javax/naming/ldap/InitialLdapContext.h b/libjava/javax/naming/ldap/InitialLdapContext.h
deleted file mode 100644
index b251180..0000000
--- a/libjava/javax/naming/ldap/InitialLdapContext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_InitialLdapContext__
-#define __javax_naming_ldap_InitialLdapContext__
-
-#pragma interface
-
-#include <javax/naming/directory/InitialDirContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-          class ExtendedRequest;
-          class ExtendedResponse;
-          class InitialLdapContext;
-          class LdapContext;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::InitialLdapContext : public ::javax::naming::directory::InitialDirContext
-{
-
-public:
-  InitialLdapContext();
-  InitialLdapContext(::java::util::Hashtable *, JArray< ::javax::naming::ldap::Control * > *);
-private:
-  ::javax::naming::ldap::LdapContext * getDefaultInitLdapCtx();
-public:
-  virtual ::javax::naming::ldap::ExtendedResponse * extendedOperation(::javax::naming::ldap::ExtendedRequest *);
-  virtual JArray< ::javax::naming::ldap::Control * > * getConnectControls();
-  virtual JArray< ::javax::naming::ldap::Control * > * getRequestControls();
-  virtual JArray< ::javax::naming::ldap::Control * > * getResponseControls();
-  virtual ::javax::naming::ldap::LdapContext * newInstance(JArray< ::javax::naming::ldap::Control * > *);
-  virtual void reconnect(JArray< ::javax::naming::ldap::Control * > *);
-  virtual void setRequestControls(JArray< ::javax::naming::ldap::Control * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_InitialLdapContext__
diff --git a/libjava/javax/naming/ldap/LdapContext.h b/libjava/javax/naming/ldap/LdapContext.h
deleted file mode 100644
index 4fa910e..0000000
--- a/libjava/javax/naming/ldap/LdapContext.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_LdapContext__
-#define __javax_naming_ldap_LdapContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-      namespace ldap
-      {
-          class Control;
-          class ExtendedRequest;
-          class ExtendedResponse;
-          class LdapContext;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::LdapContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::ldap::ExtendedResponse * extendedOperation(::javax::naming::ldap::ExtendedRequest *) = 0;
-  virtual ::javax::naming::ldap::LdapContext * newInstance(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual void reconnect(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getConnectControls() = 0;
-  virtual void setRequestControls(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getRequestControls() = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getResponseControls() = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static ::java::lang::String * CONTROL_FACTORIES;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_LdapContext__
diff --git a/libjava/javax/naming/ldap/LdapReferralException.h b/libjava/javax/naming/ldap/LdapReferralException.h
deleted file mode 100644
index 6ed5618..0000000
--- a/libjava/javax/naming/ldap/LdapReferralException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_LdapReferralException__
-#define __javax_naming_ldap_LdapReferralException__
-
-#pragma interface
-
-#include <javax/naming/ReferralException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace ldap
-      {
-          class Control;
-          class LdapReferralException;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::LdapReferralException : public ::javax::naming::ReferralException
-{
-
-public: // actually protected
-  LdapReferralException();
-  LdapReferralException(::java::lang::String *);
-public:
-  virtual ::javax::naming::Context * getReferralContext() = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *) = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *, JArray< ::javax::naming::ldap::Control * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_LdapReferralException__
diff --git a/libjava/javax/naming/ldap/StartTlsRequest.h b/libjava/javax/naming/ldap/StartTlsRequest.h
deleted file mode 100644
index 70ced7e..0000000
--- a/libjava/javax/naming/ldap/StartTlsRequest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_StartTlsRequest__
-#define __javax_naming_ldap_StartTlsRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedResponse;
-          class StartTlsRequest;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::StartTlsRequest : public ::java::lang::Object
-{
-
-public:
-  StartTlsRequest();
-  virtual ::java::lang::String * getID();
-  virtual JArray< jbyte > * getEncodedValue();
-  virtual ::javax::naming::ldap::ExtendedResponse * createExtendedResponse(::java::lang::String *, JArray< jbyte > *, jint, jint);
-private:
-  static const jlong serialVersionUID = 4441679576360753397LL;
-public:
-  static ::java::lang::String * OID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_StartTlsRequest__
diff --git a/libjava/javax/naming/ldap/StartTlsResponse.h b/libjava/javax/naming/ldap/StartTlsResponse.h
deleted file mode 100644
index 9b3d8c5..0000000
--- a/libjava/javax/naming/ldap/StartTlsResponse.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_StartTlsResponse__
-#define __javax_naming_ldap_StartTlsResponse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class StartTlsResponse;
-      }
-    }
-    namespace net
-    {
-      namespace ssl
-      {
-          class HostnameVerifier;
-          class SSLSession;
-          class SSLSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::StartTlsResponse : public ::java::lang::Object
-{
-
-public: // actually protected
-  StartTlsResponse();
-public:
-  virtual ::java::lang::String * getID();
-  virtual JArray< jbyte > * getEncodedValue();
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual void setHostnameVerifier(::javax::net::ssl::HostnameVerifier *) = 0;
-  virtual ::javax::net::ssl::SSLSession * negotiate() = 0;
-  virtual ::javax::net::ssl::SSLSession * negotiate(::javax::net::ssl::SSLSocketFactory *) = 0;
-  virtual void close() = 0;
-private:
-  static const jlong serialVersionUID = 8372842182579276418LL;
-public:
-  static ::java::lang::String * OID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_StartTlsResponse__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotification.h b/libjava/javax/naming/ldap/UnsolicitedNotification.h
deleted file mode 100644
index c23d4b0..0000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotification.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotification__
-#define __javax_naming_ldap_UnsolicitedNotification__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingException;
-      namespace ldap
-      {
-          class Control;
-          class UnsolicitedNotification;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotification : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * getReferrals() = 0;
-  virtual ::javax::naming::NamingException * getException() = 0;
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getControls() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_UnsolicitedNotification__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h b/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h
deleted file mode 100644
index b6e4a4f..0000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotificationEvent__
-#define __javax_naming_ldap_UnsolicitedNotificationEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class UnsolicitedNotification;
-          class UnsolicitedNotificationEvent;
-          class UnsolicitedNotificationListener;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotificationEvent : public ::java::util::EventObject
-{
-
-public:
-  UnsolicitedNotificationEvent(::java::lang::Object *, ::javax::naming::ldap::UnsolicitedNotification *);
-  virtual ::javax::naming::ldap::UnsolicitedNotification * getNotification();
-  virtual void dispatch(::javax::naming::ldap::UnsolicitedNotificationListener *);
-private:
-  static const jlong serialVersionUID = -2382603380799883705LL;
-  ::javax::naming::ldap::UnsolicitedNotification * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) notice;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_UnsolicitedNotificationEvent__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h b/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h
deleted file mode 100644
index d389381..0000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotificationListener__
-#define __javax_naming_ldap_UnsolicitedNotificationListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingExceptionEvent;
-      }
-      namespace ldap
-      {
-          class UnsolicitedNotificationEvent;
-          class UnsolicitedNotificationListener;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotificationListener : public ::java::lang::Object
-{
-
-public:
-  virtual void notificationReceived(::javax::naming::ldap::UnsolicitedNotificationEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_UnsolicitedNotificationListener__
diff --git a/libjava/javax/naming/spi/DirObjectFactory.h b/libjava/javax/naming/spi/DirObjectFactory.h
deleted file mode 100644
index d84d318..0000000
--- a/libjava/javax/naming/spi/DirObjectFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirObjectFactory__
-#define __javax_naming_spi_DirObjectFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirObjectFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_DirObjectFactory__
diff --git a/libjava/javax/naming/spi/DirStateFactory$Result.h b/libjava/javax/naming/spi/DirStateFactory$Result.h
deleted file mode 100644
index 586c7d3..0000000
--- a/libjava/javax/naming/spi/DirStateFactory$Result.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirStateFactory$Result__
-#define __javax_naming_spi_DirStateFactory$Result__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirStateFactory$Result;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirStateFactory$Result : public ::java::lang::Object
-{
-
-public:
-  DirStateFactory$Result(::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual ::java::lang::Object * getObject();
-  virtual ::javax::naming::directory::Attributes * getAttributes();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) obj;
-  ::javax::naming::directory::Attributes * outAttrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_DirStateFactory$Result__
diff --git a/libjava/javax/naming/spi/DirStateFactory.h b/libjava/javax/naming/spi/DirStateFactory.h
deleted file mode 100644
index 02b2b5a..0000000
--- a/libjava/javax/naming/spi/DirStateFactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirStateFactory__
-#define __javax_naming_spi_DirStateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirStateFactory;
-          class DirStateFactory$Result;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirStateFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::DirStateFactory$Result * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_DirStateFactory__
diff --git a/libjava/javax/naming/spi/DirectoryManager.h b/libjava/javax/naming/spi/DirectoryManager.h
deleted file mode 100644
index 32d015c..0000000
--- a/libjava/javax/naming/spi/DirectoryManager.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirectoryManager__
-#define __javax_naming_spi_DirectoryManager__
-
-#pragma interface
-
-#include <javax/naming/spi/NamingManager.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-      }
-      namespace spi
-      {
-          class DirStateFactory$Result;
-          class DirectoryManager;
-          class ObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirectoryManager : public ::javax::naming::spi::NamingManager
-{
-
-public: // actually package-private
-  DirectoryManager();
-public:
-  static ::javax::naming::directory::DirContext * getContinuationDirContext(::javax::naming::CannotProceedException *);
-private:
-  static ::java::lang::Object * tryCreateObject(::javax::naming::spi::ObjectFactory *, ::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-public:
-  static ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-  static ::javax::naming::spi::DirStateFactory$Result * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_DirectoryManager__
diff --git a/libjava/javax/naming/spi/InitialContextFactory.h b/libjava/javax/naming/spi/InitialContextFactory.h
deleted file mode 100644
index 446876c..0000000
--- a/libjava/javax/naming/spi/InitialContextFactory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_InitialContextFactory__
-#define __javax_naming_spi_InitialContextFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace spi
-      {
-          class InitialContextFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::InitialContextFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Context * getInitialContext(::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_InitialContextFactory__
diff --git a/libjava/javax/naming/spi/InitialContextFactoryBuilder.h b/libjava/javax/naming/spi/InitialContextFactoryBuilder.h
deleted file mode 100644
index bdd0160..0000000
--- a/libjava/javax/naming/spi/InitialContextFactoryBuilder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_InitialContextFactoryBuilder__
-#define __javax_naming_spi_InitialContextFactoryBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace spi
-      {
-          class InitialContextFactory;
-          class InitialContextFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::InitialContextFactoryBuilder : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::InitialContextFactory * createInitialContextFactory(::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_InitialContextFactoryBuilder__
diff --git a/libjava/javax/naming/spi/NamingManager.h b/libjava/javax/naming/spi/NamingManager.h
deleted file mode 100644
index 6a24048..0000000
--- a/libjava/javax/naming/spi/NamingManager.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_NamingManager__
-#define __javax_naming_spi_NamingManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class InitialContextFactoryBuilder;
-          class NamingManager;
-          class ObjectFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::NamingManager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NamingManager();
-public:
-  static jboolean hasInitialContextFactoryBuilder();
-  static ::javax::naming::Context * getInitialContext(::java::util::Hashtable *);
-public: // actually package-private
-  static ::javax::naming::Context * getURLContext(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::lang::String *, ::java::util::Hashtable *);
-  static ::java::lang::Class * forName(::java::lang::String *);
-public:
-  static ::javax::naming::Context * getURLContext(::java::lang::String *, ::java::util::Hashtable *);
-  static void setObjectFactoryBuilder(::javax::naming::spi::ObjectFactoryBuilder *);
-public: // actually package-private
-  static ::java::util::StringTokenizer * getPlusPath(::java::lang::String *, ::java::util::Hashtable *, ::javax::naming::Context *);
-public:
-  static ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static void setInitialContextFactoryBuilder(::javax::naming::spi::InitialContextFactoryBuilder *);
-  static ::javax::naming::Context * getContinuationContext(::javax::naming::CannotProceedException *);
-  static ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static ::java::lang::String * CPE;
-private:
-  static ::javax::naming::spi::InitialContextFactoryBuilder * icfb;
-public: // actually package-private
-  static ::javax::naming::spi::ObjectFactoryBuilder * ofb;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_NamingManager__
diff --git a/libjava/javax/naming/spi/ObjectFactory.h b/libjava/javax/naming/spi/ObjectFactory.h
deleted file mode 100644
index 62d5639..0000000
--- a/libjava/javax/naming/spi/ObjectFactory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ObjectFactory__
-#define __javax_naming_spi_ObjectFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class ObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ObjectFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_ObjectFactory__
diff --git a/libjava/javax/naming/spi/ObjectFactoryBuilder.h b/libjava/javax/naming/spi/ObjectFactoryBuilder.h
deleted file mode 100644
index eb457e4..0000000
--- a/libjava/javax/naming/spi/ObjectFactoryBuilder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ObjectFactoryBuilder__
-#define __javax_naming_spi_ObjectFactoryBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace spi
-      {
-          class ObjectFactory;
-          class ObjectFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ObjectFactoryBuilder : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::ObjectFactory * createObjectFactory(::java::lang::Object *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_ObjectFactoryBuilder__
diff --git a/libjava/javax/naming/spi/ResolveResult.h b/libjava/javax/naming/spi/ResolveResult.h
deleted file mode 100644
index 72f1187..0000000
--- a/libjava/javax/naming/spi/ResolveResult.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ResolveResult__
-#define __javax_naming_spi_ResolveResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-      namespace spi
-      {
-          class ResolveResult;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ResolveResult : public ::java::lang::Object
-{
-
-public: // actually protected
-  ResolveResult();
-public:
-  ResolveResult(::java::lang::Object *, ::java::lang::String *);
-  ResolveResult(::java::lang::Object *, ::javax::naming::Name *);
-  virtual ::javax::naming::Name * getRemainingName();
-  virtual ::java::lang::Object * getResolvedObj();
-  virtual void setRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingComponent(::java::lang::String *);
-  virtual void setResolvedObj(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -4552108072002407559LL;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) resolvedObj;
-  ::javax::naming::Name * remainingName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_ResolveResult__
diff --git a/libjava/javax/naming/spi/Resolver.h b/libjava/javax/naming/spi/Resolver.h
deleted file mode 100644
index bc7956d..0000000
--- a/libjava/javax/naming/spi/Resolver.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_Resolver__
-#define __javax_naming_spi_Resolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-      namespace spi
-      {
-          class ResolveResult;
-          class Resolver;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::Resolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::ResolveResult * resolveToClass(::javax::naming::Name *, ::java::lang::Class *) = 0;
-  virtual ::javax::naming::spi::ResolveResult * resolveToClass(::java::lang::String *, ::java::lang::Class *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_Resolver__
diff --git a/libjava/javax/naming/spi/StateFactory.h b/libjava/javax/naming/spi/StateFactory.h
deleted file mode 100644
index 2039a27..0000000
--- a/libjava/javax/naming/spi/StateFactory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_StateFactory__
-#define __javax_naming_spi_StateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class StateFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::StateFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_StateFactory__