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

161 files changed, 0 insertions, 7205 deletions

diff --git a/libjava/java/security/AccessControlContext.h b/libjava/java/security/AccessControlContext.h
deleted file mode 100644
index e83852a7719..00000000000
--- a/libjava/java/security/AccessControlContext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AccessControlContext__
-#define __java_security_AccessControlContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-        class DomainCombiner;
-        class Permission;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::AccessControlContext : public ::java::lang::Object
-{
-
-public:
-  AccessControlContext(JArray< ::java::security::ProtectionDomain * > *);
-  AccessControlContext(::java::security::AccessControlContext *, ::java::security::DomainCombiner *);
-public: // actually package-private
-  AccessControlContext(JArray< ::java::security::ProtectionDomain * > *, ::java::security::AccessControlContext *, ::java::security::DomainCombiner *);
-public:
-  ::java::security::DomainCombiner * getDomainCombiner();
-  void checkPermission(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-public: // actually package-private
-  JArray< ::java::security::ProtectionDomain * > * getProtectionDomains();
-private:
-  JArray< ::java::security::ProtectionDomain * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) protectionDomains;
-  ::java::security::DomainCombiner * combiner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AccessControlContext__
diff --git a/libjava/java/security/AccessControlException.h b/libjava/java/security/AccessControlException.h
deleted file mode 100644
index 1dcd122cae2..00000000000
--- a/libjava/java/security/AccessControlException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AccessControlException__
-#define __java_security_AccessControlException__
-
-#pragma interface
-
-#include <java/lang/SecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlException;
-        class Permission;
-    }
-  }
-}
-
-class java::security::AccessControlException : public ::java::lang::SecurityException
-{
-
-public:
-  AccessControlException(::java::lang::String *);
-  AccessControlException(::java::lang::String *, ::java::security::Permission *);
-  virtual ::java::security::Permission * getPermission();
-private:
-  static const jlong serialVersionUID = 5138225684096988535LL;
-  ::java::security::Permission * __attribute__((aligned(__alignof__( ::java::lang::SecurityException)))) perm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AccessControlException__
diff --git a/libjava/java/security/AccessController.h b/libjava/java/security/AccessController.h
deleted file mode 100644
index 96cc367c718..00000000000
--- a/libjava/java/security/AccessController.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AccessController__
-#define __java_security_AccessController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-        class AccessController;
-        class Permission;
-        class PrivilegedAction;
-        class PrivilegedExceptionAction;
-    }
-  }
-}
-
-class java::security::AccessController : public ::java::lang::Object
-{
-
-  AccessController();
-public:
-  static void checkPermission(::java::security::Permission *);
-  static ::java::lang::Object * doPrivileged(::java::security::PrivilegedAction *);
-  static ::java::lang::Object * doPrivileged(::java::security::PrivilegedAction *, ::java::security::AccessControlContext *);
-  static ::java::lang::Object * doPrivileged(::java::security::PrivilegedExceptionAction *);
-  static ::java::lang::Object * doPrivileged(::java::security::PrivilegedExceptionAction *, ::java::security::AccessControlContext *);
-  static ::java::security::AccessControlContext * getContext();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AccessController__
diff --git a/libjava/java/security/AlgorithmParameterGenerator.h b/libjava/java/security/AlgorithmParameterGenerator.h
deleted file mode 100644
index 02c9dbf3d7c..00000000000
--- a/libjava/java/security/AlgorithmParameterGenerator.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AlgorithmParameterGenerator__
-#define __java_security_AlgorithmParameterGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameterGenerator;
-        class AlgorithmParameterGeneratorSpi;
-        class AlgorithmParameters;
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::AlgorithmParameterGenerator : public ::java::lang::Object
-{
-
-public: // actually protected
-  AlgorithmParameterGenerator(::java::security::AlgorithmParameterGeneratorSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  static ::java::security::AlgorithmParameterGenerator * getInstance(::java::lang::String *);
-  static ::java::security::AlgorithmParameterGenerator * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::AlgorithmParameterGenerator * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(jint);
-  virtual void init(jint, ::java::security::SecureRandom *);
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::AlgorithmParameters * generateParameters();
-private:
-  static ::java::lang::String * ALGORITHM_PARAMETER_GENERATOR;
-  ::java::security::AlgorithmParameterGeneratorSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) paramGenSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AlgorithmParameterGenerator__
diff --git a/libjava/java/security/AlgorithmParameterGeneratorSpi.h b/libjava/java/security/AlgorithmParameterGeneratorSpi.h
deleted file mode 100644
index c40dfd3df6d..00000000000
--- a/libjava/java/security/AlgorithmParameterGeneratorSpi.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AlgorithmParameterGeneratorSpi__
-#define __java_security_AlgorithmParameterGeneratorSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameterGeneratorSpi;
-        class AlgorithmParameters;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::AlgorithmParameterGeneratorSpi : public ::java::lang::Object
-{
-
-public:
-  AlgorithmParameterGeneratorSpi();
-public: // actually protected
-  virtual void engineInit(jint, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual ::java::security::AlgorithmParameters * engineGenerateParameters() = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AlgorithmParameterGeneratorSpi__
diff --git a/libjava/java/security/AlgorithmParameters.h b/libjava/java/security/AlgorithmParameters.h
deleted file mode 100644
index 630b0431216..00000000000
--- a/libjava/java/security/AlgorithmParameters.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AlgorithmParameters__
-#define __java_security_AlgorithmParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class AlgorithmParametersSpi;
-        class Provider;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::AlgorithmParameters : public ::java::lang::Object
-{
-
-public: // actually protected
-  AlgorithmParameters(::java::security::AlgorithmParametersSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  static ::java::security::AlgorithmParameters * getInstance(::java::lang::String *);
-  static ::java::security::AlgorithmParameters * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::AlgorithmParameters * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(JArray< jbyte > *);
-  virtual void init(JArray< jbyte > *, ::java::lang::String *);
-  virtual ::java::security::spec::AlgorithmParameterSpec * getParameterSpec(::java::lang::Class *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual JArray< jbyte > * getEncoded(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-private:
-  static ::java::lang::String * ALGORITHM_PARAMETERS;
-  ::java::security::AlgorithmParametersSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) paramSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AlgorithmParameters__
diff --git a/libjava/java/security/AlgorithmParametersSpi.h b/libjava/java/security/AlgorithmParametersSpi.h
deleted file mode 100644
index a3c26967758..00000000000
--- a/libjava/java/security/AlgorithmParametersSpi.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AlgorithmParametersSpi__
-#define __java_security_AlgorithmParametersSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParametersSpi;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::AlgorithmParametersSpi : public ::java::lang::Object
-{
-
-public:
-  AlgorithmParametersSpi();
-public: // actually protected
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *) = 0;
-  virtual void engineInit(JArray< jbyte > *) = 0;
-  virtual void engineInit(JArray< jbyte > *, ::java::lang::String *) = 0;
-  virtual ::java::security::spec::AlgorithmParameterSpec * engineGetParameterSpec(::java::lang::Class *) = 0;
-  virtual JArray< jbyte > * engineGetEncoded() = 0;
-  virtual JArray< jbyte > * engineGetEncoded(::java::lang::String *) = 0;
-  virtual ::java::lang::String * engineToString() = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AlgorithmParametersSpi__
diff --git a/libjava/java/security/AllPermission$AllPermissionCollection.h b/libjava/java/security/AllPermission$AllPermissionCollection.h
deleted file mode 100644
index bf88353dbca..00000000000
--- a/libjava/java/security/AllPermission$AllPermissionCollection.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AllPermission$AllPermissionCollection__
-#define __java_security_AllPermission$AllPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AllPermission$AllPermissionCollection;
-        class Permission;
-    }
-  }
-}
-
-class java::security::AllPermission$AllPermissionCollection : public ::java::security::PermissionCollection
-{
-
-  AllPermission$AllPermissionCollection();
-public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-public: // actually package-private
-  AllPermission$AllPermissionCollection(::java::security::AllPermission$AllPermissionCollection *);
-private:
-  static const jlong serialVersionUID = -4023755556366636806LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) all_allowed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AllPermission$AllPermissionCollection__
diff --git a/libjava/java/security/AllPermission.h b/libjava/java/security/AllPermission.h
deleted file mode 100644
index 7700a935029..00000000000
--- a/libjava/java/security/AllPermission.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AllPermission__
-#define __java_security_AllPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AllPermission;
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::security::AllPermission : public ::java::security::Permission
-{
-
-public:
-  AllPermission();
-  AllPermission(::java::lang::String *, ::java::lang::String *);
-  jboolean implies(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * getActions();
-  ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static const jlong serialVersionUID = -2916474571451318075LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AllPermission__
diff --git a/libjava/java/security/BasicPermission$BasicPermissionCollection.h b/libjava/java/security/BasicPermission$BasicPermissionCollection.h
deleted file mode 100644
index a2d14544ce5..00000000000
--- a/libjava/java/security/BasicPermission$BasicPermissionCollection.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_BasicPermission$BasicPermissionCollection__
-#define __java_security_BasicPermission$BasicPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class BasicPermission$BasicPermissionCollection;
-        class Permission;
-    }
-  }
-}
-
-class java::security::BasicPermission$BasicPermissionCollection : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  BasicPermission$BasicPermissionCollection(::java::lang::Class *);
-public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-private:
-  static const jlong serialVersionUID = 739301742472979399LL;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-  jboolean all_allowed;
-  ::java::lang::Class * permClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_BasicPermission$BasicPermissionCollection__
diff --git a/libjava/java/security/BasicPermission.h b/libjava/java/security/BasicPermission.h
deleted file mode 100644
index 36838628717..00000000000
--- a/libjava/java/security/BasicPermission.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_BasicPermission__
-#define __java_security_BasicPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class BasicPermission;
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::security::BasicPermission : public ::java::security::Permission
-{
-
-public:
-  BasicPermission(::java::lang::String *);
-  BasicPermission(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean implies(::java::security::Permission *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getActions();
-  virtual ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static const jlong serialVersionUID = 6279438298436773498LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_BasicPermission__
diff --git a/libjava/java/security/Certificate.h b/libjava/java/security/Certificate.h
deleted file mode 100644
index 9c7af28426c..00000000000
--- a/libjava/java/security/Certificate.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Certificate__
-#define __java_security_Certificate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Certificate;
-        class Principal;
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::Certificate : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::security::Principal * getGuarantor() = 0;
-  virtual ::java::security::Principal * getPrincipal() = 0;
-  virtual ::java::security::PublicKey * getPublicKey() = 0;
-  virtual void encode(::java::io::OutputStream *) = 0;
-  virtual void decode(::java::io::InputStream *) = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual ::java::lang::String * toString(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_Certificate__
diff --git a/libjava/java/security/CodeSource.h b/libjava/java/security/CodeSource.h
deleted file mode 100644
index 35dffd9ab59..00000000000
--- a/libjava/java/security/CodeSource.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_CodeSource__
-#define __java_security_CodeSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class CodeSource;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::CodeSource : public ::java::lang::Object
-{
-
-public:
-  CodeSource(::java::net::URL *, JArray< ::java::security::cert::Certificate * > *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::net::URL * getLocation();
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificates();
-  virtual jboolean implies(::java::security::CodeSource *);
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 4977541819976013951LL;
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) location;
-  ::java::util::HashSet * certs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_CodeSource__
diff --git a/libjava/java/security/DigestException.h b/libjava/java/security/DigestException.h
deleted file mode 100644
index d216415c915..00000000000
--- a/libjava/java/security/DigestException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DigestException__
-#define __java_security_DigestException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DigestException;
-    }
-  }
-}
-
-class java::security::DigestException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  DigestException();
-  DigestException(::java::lang::String *);
-  DigestException(::java::lang::String *, ::java::lang::Throwable *);
-  DigestException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 5821450303093652515LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DigestException__
diff --git a/libjava/java/security/DigestInputStream.h b/libjava/java/security/DigestInputStream.h
deleted file mode 100644
index b112ad2c548..00000000000
--- a/libjava/java/security/DigestInputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DigestInputStream__
-#define __java_security_DigestInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DigestInputStream;
-        class MessageDigest;
-    }
-  }
-}
-
-class java::security::DigestInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  DigestInputStream(::java::io::InputStream *, ::java::security::MessageDigest *);
-  virtual ::java::security::MessageDigest * getMessageDigest();
-  virtual void setMessageDigest(::java::security::MessageDigest *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void on(jboolean);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::security::MessageDigest * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) digest;
-private:
-  jboolean state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DigestInputStream__
diff --git a/libjava/java/security/DigestOutputStream.h b/libjava/java/security/DigestOutputStream.h
deleted file mode 100644
index 5c1605c76f7..00000000000
--- a/libjava/java/security/DigestOutputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DigestOutputStream__
-#define __java_security_DigestOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DigestOutputStream;
-        class MessageDigest;
-    }
-  }
-}
-
-class java::security::DigestOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  DigestOutputStream(::java::io::OutputStream *, ::java::security::MessageDigest *);
-  virtual ::java::security::MessageDigest * getMessageDigest();
-  virtual void setMessageDigest(::java::security::MessageDigest *);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void on(jboolean);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::security::MessageDigest * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) digest;
-private:
-  jboolean state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DigestOutputStream__
diff --git a/libjava/java/security/DomainCombiner.h b/libjava/java/security/DomainCombiner.h
deleted file mode 100644
index 18906b929b0..00000000000
--- a/libjava/java/security/DomainCombiner.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DomainCombiner__
-#define __java_security_DomainCombiner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DomainCombiner;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::DomainCombiner : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::security::ProtectionDomain * > * combine(JArray< ::java::security::ProtectionDomain * > *, JArray< ::java::security::ProtectionDomain * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_DomainCombiner__
diff --git a/libjava/java/security/DummyKeyPairGenerator.h b/libjava/java/security/DummyKeyPairGenerator.h
deleted file mode 100644
index c0f35818b54..00000000000
--- a/libjava/java/security/DummyKeyPairGenerator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DummyKeyPairGenerator__
-#define __java_security_DummyKeyPairGenerator__
-
-#pragma interface
-
-#include <java/security/KeyPairGenerator.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DummyKeyPairGenerator;
-        class KeyPair;
-        class KeyPairGeneratorSpi;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::DummyKeyPairGenerator : public ::java::security::KeyPairGenerator
-{
-
-public:
-  DummyKeyPairGenerator(::java::security::KeyPairGeneratorSpi *, ::java::lang::String *);
-  ::java::lang::Object * clone();
-  void initialize(jint, ::java::security::SecureRandom *);
-  void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  ::java::security::KeyPair * generateKeyPair();
-private:
-  ::java::security::KeyPairGeneratorSpi * __attribute__((aligned(__alignof__( ::java::security::KeyPairGenerator)))) kpgSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DummyKeyPairGenerator__
diff --git a/libjava/java/security/DummyMessageDigest.h b/libjava/java/security/DummyMessageDigest.h
deleted file mode 100644
index 431096dfe6b..00000000000
--- a/libjava/java/security/DummyMessageDigest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DummyMessageDigest__
-#define __java_security_DummyMessageDigest__
-
-#pragma interface
-
-#include <java/security/MessageDigest.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DummyMessageDigest;
-        class MessageDigestSpi;
-    }
-  }
-}
-
-class java::security::DummyMessageDigest : public ::java::security::MessageDigest
-{
-
-public:
-  DummyMessageDigest(::java::security::MessageDigestSpi *, ::java::lang::String *);
-  ::java::lang::Object * clone();
-  JArray< jbyte > * engineDigest();
-  jint engineDigest(JArray< jbyte > *, jint, jint);
-  jint engineGetDigestLength();
-  void engineReset();
-  void engineUpdate(jbyte);
-  void engineUpdate(JArray< jbyte > *, jint, jint);
-private:
-  ::java::security::MessageDigestSpi * __attribute__((aligned(__alignof__( ::java::security::MessageDigest)))) mdSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DummyMessageDigest__
diff --git a/libjava/java/security/DummySignature.h b/libjava/java/security/DummySignature.h
deleted file mode 100644
index 34547473fed..00000000000
--- a/libjava/java/security/DummySignature.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DummySignature__
-#define __java_security_DummySignature__
-
-#pragma interface
-
-#include <java/security/Signature.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DummySignature;
-        class PrivateKey;
-        class PublicKey;
-        class SignatureSpi;
-    }
-  }
-}
-
-class java::security::DummySignature : public ::java::security::Signature
-{
-
-public:
-  DummySignature(::java::security::SignatureSpi *, ::java::lang::String *);
-  ::java::lang::Object * clone();
-public: // actually protected
-  void engineInitVerify(::java::security::PublicKey *);
-  void engineInitSign(::java::security::PrivateKey *);
-  void engineUpdate(jbyte);
-  void engineUpdate(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * engineSign();
-  jboolean engineVerify(JArray< jbyte > *);
-  void engineSetParameter(::java::lang::String *, ::java::lang::Object *);
-  ::java::lang::Object * engineGetParameter(::java::lang::String *);
-private:
-  ::java::security::SignatureSpi * __attribute__((aligned(__alignof__( ::java::security::Signature)))) sigSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DummySignature__
diff --git a/libjava/java/security/GeneralSecurityException.h b/libjava/java/security/GeneralSecurityException.h
deleted file mode 100644
index 6b309b5ebeb..00000000000
--- a/libjava/java/security/GeneralSecurityException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_GeneralSecurityException__
-#define __java_security_GeneralSecurityException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class GeneralSecurityException;
-    }
-  }
-}
-
-class java::security::GeneralSecurityException : public ::java::lang::Exception
-{
-
-public:
-  GeneralSecurityException();
-  GeneralSecurityException(::java::lang::String *);
-  GeneralSecurityException(::java::lang::String *, ::java::lang::Throwable *);
-  GeneralSecurityException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 894798122053539237LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_GeneralSecurityException__
diff --git a/libjava/java/security/Guard.h b/libjava/java/security/Guard.h
deleted file mode 100644
index 07cc6437d86..00000000000
--- a/libjava/java/security/Guard.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Guard__
-#define __java_security_Guard__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Guard;
-    }
-  }
-}
-
-class java::security::Guard : public ::java::lang::Object
-{
-
-public:
-  virtual void checkGuard(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_Guard__
diff --git a/libjava/java/security/GuardedObject.h b/libjava/java/security/GuardedObject.h
deleted file mode 100644
index 379651249b2..00000000000
--- a/libjava/java/security/GuardedObject.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_GuardedObject__
-#define __java_security_GuardedObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Guard;
-        class GuardedObject;
-    }
-  }
-}
-
-class java::security::GuardedObject : public ::java::lang::Object
-{
-
-public:
-  GuardedObject(::java::lang::Object *, ::java::security::Guard *);
-  virtual ::java::lang::Object * getObject();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -5240450096227834308LL;
-  ::java::security::Guard * __attribute__((aligned(__alignof__( ::java::lang::Object)))) guard;
-  ::java::lang::Object * object;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_GuardedObject__
diff --git a/libjava/java/security/Identity.h b/libjava/java/security/Identity.h
deleted file mode 100644
index 8208e7ff67e..00000000000
--- a/libjava/java/security/Identity.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Identity__
-#define __java_security_Identity__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Certificate;
-        class Identity;
-        class IdentityScope;
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::Identity : public ::java::lang::Object
-{
-
-public: // actually protected
-  Identity();
-public:
-  Identity(::java::lang::String *, ::java::security::IdentityScope *);
-  Identity(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::security::IdentityScope * getScope();
-  virtual ::java::security::PublicKey * getPublicKey();
-  virtual void setPublicKey(::java::security::PublicKey *);
-  virtual void setInfo(::java::lang::String *);
-  virtual ::java::lang::String * getInfo();
-  virtual void addCertificate(::java::security::Certificate *);
-  virtual void removeCertificate(::java::security::Certificate *);
-  virtual JArray< ::java::security::Certificate * > * certificates();
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually protected
-  virtual jboolean identityEquals(::java::security::Identity *);
-public:
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jboolean);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = 3609922007826600659LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::security::IdentityScope * scope;
-  ::java::security::PublicKey * publicKey;
-  ::java::lang::String * info;
-  ::java::util::Vector * certificates__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Identity__
diff --git a/libjava/java/security/IdentityScope.h b/libjava/java/security/IdentityScope.h
deleted file mode 100644
index 90a49303121..00000000000
--- a/libjava/java/security/IdentityScope.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_IdentityScope__
-#define __java_security_IdentityScope__
-
-#pragma interface
-
-#include <java/security/Identity.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Identity;
-        class IdentityScope;
-        class Principal;
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::IdentityScope : public ::java::security::Identity
-{
-
-public: // actually protected
-  IdentityScope();
-public:
-  IdentityScope(::java::lang::String *);
-  IdentityScope(::java::lang::String *, ::java::security::IdentityScope *);
-  static ::java::security::IdentityScope * getSystemScope();
-public: // actually protected
-  static void setSystemScope(::java::security::IdentityScope *);
-public:
-  virtual jint size() = 0;
-  virtual ::java::security::Identity * getIdentity(::java::lang::String *) = 0;
-  virtual ::java::security::Identity * getIdentity(::java::security::Principal *);
-  virtual ::java::security::Identity * getIdentity(::java::security::PublicKey *) = 0;
-  virtual void addIdentity(::java::security::Identity *) = 0;
-  virtual void removeIdentity(::java::security::Identity *) = 0;
-  virtual ::java::util::Enumeration * identities() = 0;
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -2337346281189773310LL;
-  static ::java::security::IdentityScope * systemScope;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_IdentityScope__
diff --git a/libjava/java/security/IntersectingDomainCombiner.h b/libjava/java/security/IntersectingDomainCombiner.h
deleted file mode 100644
index f192c261511..00000000000
--- a/libjava/java/security/IntersectingDomainCombiner.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_IntersectingDomainCombiner__
-#define __java_security_IntersectingDomainCombiner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class IntersectingDomainCombiner;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::IntersectingDomainCombiner : public ::java::lang::Object
-{
-
-  IntersectingDomainCombiner();
-public:
-  JArray< ::java::security::ProtectionDomain * > * combine(JArray< ::java::security::ProtectionDomain * > *, JArray< ::java::security::ProtectionDomain * > *);
-public: // actually package-private
-  static ::java::security::IntersectingDomainCombiner * SINGLETON;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_IntersectingDomainCombiner__
diff --git a/libjava/java/security/InvalidAlgorithmParameterException.h b/libjava/java/security/InvalidAlgorithmParameterException.h
deleted file mode 100644
index 8ff0d7ed314..00000000000
--- a/libjava/java/security/InvalidAlgorithmParameterException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_InvalidAlgorithmParameterException__
-#define __java_security_InvalidAlgorithmParameterException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class InvalidAlgorithmParameterException;
-    }
-  }
-}
-
-class java::security::InvalidAlgorithmParameterException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  InvalidAlgorithmParameterException();
-  InvalidAlgorithmParameterException(::java::lang::String *);
-  InvalidAlgorithmParameterException(::java::lang::String *, ::java::lang::Throwable *);
-  InvalidAlgorithmParameterException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 2864672297499471472LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_InvalidAlgorithmParameterException__
diff --git a/libjava/java/security/InvalidKeyException.h b/libjava/java/security/InvalidKeyException.h
deleted file mode 100644
index f79473c40bc..00000000000
--- a/libjava/java/security/InvalidKeyException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_InvalidKeyException__
-#define __java_security_InvalidKeyException__
-
-#pragma interface
-
-#include <java/security/KeyException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class InvalidKeyException;
-    }
-  }
-}
-
-class java::security::InvalidKeyException : public ::java::security::KeyException
-{
-
-public:
-  InvalidKeyException();
-  InvalidKeyException(::java::lang::String *);
-  InvalidKeyException(::java::lang::String *, ::java::lang::Throwable *);
-  InvalidKeyException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 5698479920593359816LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_InvalidKeyException__
diff --git a/libjava/java/security/InvalidParameterException.h b/libjava/java/security/InvalidParameterException.h
deleted file mode 100644
index fd9c9a73279..00000000000
--- a/libjava/java/security/InvalidParameterException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_InvalidParameterException__
-#define __java_security_InvalidParameterException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class InvalidParameterException;
-    }
-  }
-}
-
-class java::security::InvalidParameterException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  InvalidParameterException();
-  InvalidParameterException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -857968536935667808LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_InvalidParameterException__
diff --git a/libjava/java/security/Key.h b/libjava/java/security/Key.h
deleted file mode 100644
index 630f8123b0f..00000000000
--- a/libjava/java/security/Key.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Key__
-#define __java_security_Key__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-    }
-  }
-}
-
-class java::security::Key : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 6603384152749567654LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_Key__
diff --git a/libjava/java/security/KeyException.h b/libjava/java/security/KeyException.h
deleted file mode 100644
index 0d3ce513843..00000000000
--- a/libjava/java/security/KeyException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyException__
-#define __java_security_KeyException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyException;
-    }
-  }
-}
-
-class java::security::KeyException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  KeyException();
-  KeyException(::java::lang::String *);
-  KeyException(::java::lang::String *, ::java::lang::Throwable *);
-  KeyException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -7483676942812432108LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyException__
diff --git a/libjava/java/security/KeyFactory.h b/libjava/java/security/KeyFactory.h
deleted file mode 100644
index adcec17f7ab..00000000000
--- a/libjava/java/security/KeyFactory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyFactory__
-#define __java_security_KeyFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class KeyFactory;
-        class KeyFactorySpi;
-        class PrivateKey;
-        class Provider;
-        class PublicKey;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class java::security::KeyFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyFactory(::java::security::KeyFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::security::KeyFactory * getInstance(::java::lang::String *);
-  static ::java::security::KeyFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::KeyFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::PublicKey * generatePublic(::java::security::spec::KeySpec *);
-  virtual ::java::security::PrivateKey * generatePrivate(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * getKeySpec(::java::security::Key *, ::java::lang::Class *);
-  virtual ::java::security::Key * translateKey(::java::security::Key *);
-private:
-  static ::java::lang::String * KEY_FACTORY;
-  ::java::security::KeyFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyFacSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyFactory__
diff --git a/libjava/java/security/KeyFactorySpi.h b/libjava/java/security/KeyFactorySpi.h
deleted file mode 100644
index 518893b59a6..00000000000
--- a/libjava/java/security/KeyFactorySpi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyFactorySpi__
-#define __java_security_KeyFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class KeyFactorySpi;
-        class PrivateKey;
-        class PublicKey;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class java::security::KeyFactorySpi : public ::java::lang::Object
-{
-
-public:
-  KeyFactorySpi();
-public: // actually protected
-  virtual ::java::security::PublicKey * engineGeneratePublic(::java::security::spec::KeySpec *) = 0;
-  virtual ::java::security::PrivateKey * engineGeneratePrivate(::java::security::spec::KeySpec *) = 0;
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::java::security::Key *, ::java::lang::Class *) = 0;
-  virtual ::java::security::Key * engineTranslateKey(::java::security::Key *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyFactorySpi__
diff --git a/libjava/java/security/KeyManagementException.h b/libjava/java/security/KeyManagementException.h
deleted file mode 100644
index 20d6964f98d..00000000000
--- a/libjava/java/security/KeyManagementException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyManagementException__
-#define __java_security_KeyManagementException__
-
-#pragma interface
-
-#include <java/security/KeyException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyManagementException;
-    }
-  }
-}
-
-class java::security::KeyManagementException : public ::java::security::KeyException
-{
-
-public:
-  KeyManagementException();
-  KeyManagementException(::java::lang::String *);
-  KeyManagementException(::java::lang::String *, ::java::lang::Throwable *);
-  KeyManagementException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 947674216157062695LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyManagementException__
diff --git a/libjava/java/security/KeyPair.h b/libjava/java/security/KeyPair.h
deleted file mode 100644
index c6c607bb0e6..00000000000
--- a/libjava/java/security/KeyPair.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyPair__
-#define __java_security_KeyPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::KeyPair : public ::java::lang::Object
-{
-
-public:
-  KeyPair(::java::security::PublicKey *, ::java::security::PrivateKey *);
-  ::java::security::PublicKey * getPublic();
-  ::java::security::PrivateKey * getPrivate();
-private:
-  static const jlong serialVersionUID = -7565189502268009837LL;
-  ::java::security::PublicKey * __attribute__((aligned(__alignof__( ::java::lang::Object)))) publicKey;
-  ::java::security::PrivateKey * privateKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyPair__
diff --git a/libjava/java/security/KeyPairGenerator.h b/libjava/java/security/KeyPairGenerator.h
deleted file mode 100644
index f1bef60c54c..00000000000
--- a/libjava/java/security/KeyPairGenerator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyPairGenerator__
-#define __java_security_KeyPairGenerator__
-
-#pragma interface
-
-#include <java/security/KeyPairGeneratorSpi.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-        class KeyPairGenerator;
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::KeyPairGenerator : public ::java::security::KeyPairGeneratorSpi
-{
-
-public: // actually protected
-  KeyPairGenerator(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  static ::java::security::KeyPairGenerator * getInstance(::java::lang::String *);
-  static ::java::security::KeyPairGenerator * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::KeyPairGenerator * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void initialize(jint);
-  virtual void initialize(jint, ::java::security::SecureRandom *);
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::KeyPair * genKeyPair();
-  virtual ::java::security::KeyPair * generateKeyPair();
-private:
-  static ::java::lang::String * KEY_PAIR_GENERATOR;
-public: // actually package-private
-  ::java::security::Provider * __attribute__((aligned(__alignof__( ::java::security::KeyPairGeneratorSpi)))) provider;
-private:
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyPairGenerator__
diff --git a/libjava/java/security/KeyPairGeneratorSpi.h b/libjava/java/security/KeyPairGeneratorSpi.h
deleted file mode 100644
index 0aa4389e5eb..00000000000
--- a/libjava/java/security/KeyPairGeneratorSpi.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyPairGeneratorSpi__
-#define __java_security_KeyPairGeneratorSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-        class KeyPairGeneratorSpi;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::KeyPairGeneratorSpi : public ::java::lang::Object
-{
-
-public:
-  KeyPairGeneratorSpi();
-  virtual void initialize(jint, ::java::security::SecureRandom *) = 0;
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::KeyPair * generateKeyPair() = 0;
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyPairGeneratorSpi__
diff --git a/libjava/java/security/KeyStore$1.h b/libjava/java/security/KeyStore$1.h
deleted file mode 100644
index 335569c08b8..00000000000
--- a/libjava/java/security/KeyStore$1.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyStore$1__
-#define __java_security_KeyStore$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore$1;
-    }
-  }
-}
-
-class java::security::KeyStore$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  KeyStore$1();
-public:
-  virtual ::java::lang::String * KeyStore$1$run();
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyStore$1__
diff --git a/libjava/java/security/KeyStore.h b/libjava/java/security/KeyStore.h
deleted file mode 100644
index 80f79814aa4..00000000000
--- a/libjava/java/security/KeyStore.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyStore__
-#define __java_security_KeyStore__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class KeyStore;
-        class KeyStoreSpi;
-        class Provider;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::KeyStore : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyStore(::java::security::KeyStoreSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::security::KeyStore * getInstance(::java::lang::String *);
-  static ::java::security::KeyStore * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::KeyStore * getInstance(::java::lang::String *, ::java::security::Provider *);
-  static ::java::lang::String * getDefaultType();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::lang::String * getType();
-  virtual ::java::security::Key * getKey(::java::lang::String *, JArray< jchar > *);
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificateChain(::java::lang::String *);
-  virtual ::java::security::cert::Certificate * getCertificate(::java::lang::String *);
-  virtual ::java::util::Date * getCreationDate(::java::lang::String *);
-  virtual void setKeyEntry(::java::lang::String *, ::java::security::Key *, JArray< jchar > *, JArray< ::java::security::cert::Certificate * > *);
-  virtual void setKeyEntry(::java::lang::String *, JArray< jbyte > *, JArray< ::java::security::cert::Certificate * > *);
-  virtual void setCertificateEntry(::java::lang::String *, ::java::security::cert::Certificate *);
-  virtual void deleteEntry(::java::lang::String *);
-  virtual ::java::util::Enumeration * aliases();
-  virtual jboolean containsAlias(::java::lang::String *);
-  virtual jint size();
-  virtual jboolean isKeyEntry(::java::lang::String *);
-  virtual jboolean isCertificateEntry(::java::lang::String *);
-  virtual ::java::lang::String * getCertificateAlias(::java::security::cert::Certificate *);
-  virtual void store(::java::io::OutputStream *, JArray< jchar > *);
-  virtual void load(::java::io::InputStream *, JArray< jchar > *);
-private:
-  static ::java::lang::String * KEY_STORE;
-  ::java::security::KeyStoreSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyStoreSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyStore__
diff --git a/libjava/java/security/KeyStoreException.h b/libjava/java/security/KeyStoreException.h
deleted file mode 100644
index e056a68a7bc..00000000000
--- a/libjava/java/security/KeyStoreException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyStoreException__
-#define __java_security_KeyStoreException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStoreException;
-    }
-  }
-}
-
-class java::security::KeyStoreException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  KeyStoreException();
-  KeyStoreException(::java::lang::String *);
-  KeyStoreException(::java::lang::String *, ::java::lang::Throwable *);
-  KeyStoreException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1119353179322377262LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyStoreException__
diff --git a/libjava/java/security/KeyStoreSpi.h b/libjava/java/security/KeyStoreSpi.h
deleted file mode 100644
index 054cea6f125..00000000000
--- a/libjava/java/security/KeyStoreSpi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyStoreSpi__
-#define __java_security_KeyStoreSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class KeyStoreSpi;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::KeyStoreSpi : public ::java::lang::Object
-{
-
-public:
-  KeyStoreSpi();
-  virtual ::java::security::Key * engineGetKey(::java::lang::String *, JArray< jchar > *) = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * engineGetCertificateChain(::java::lang::String *) = 0;
-  virtual ::java::security::cert::Certificate * engineGetCertificate(::java::lang::String *) = 0;
-  virtual ::java::util::Date * engineGetCreationDate(::java::lang::String *) = 0;
-  virtual void engineSetKeyEntry(::java::lang::String *, ::java::security::Key *, JArray< jchar > *, JArray< ::java::security::cert::Certificate * > *) = 0;
-  virtual void engineSetKeyEntry(::java::lang::String *, JArray< jbyte > *, JArray< ::java::security::cert::Certificate * > *) = 0;
-  virtual void engineSetCertificateEntry(::java::lang::String *, ::java::security::cert::Certificate *) = 0;
-  virtual void engineDeleteEntry(::java::lang::String *) = 0;
-  virtual ::java::util::Enumeration * engineAliases() = 0;
-  virtual jboolean engineContainsAlias(::java::lang::String *) = 0;
-  virtual jint engineSize() = 0;
-  virtual jboolean engineIsKeyEntry(::java::lang::String *) = 0;
-  virtual jboolean engineIsCertificateEntry(::java::lang::String *) = 0;
-  virtual ::java::lang::String * engineGetCertificateAlias(::java::security::cert::Certificate *) = 0;
-  virtual void engineStore(::java::io::OutputStream *, JArray< jchar > *) = 0;
-  virtual void engineLoad(::java::io::InputStream *, JArray< jchar > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyStoreSpi__
diff --git a/libjava/java/security/MessageDigest.h b/libjava/java/security/MessageDigest.h
deleted file mode 100644
index 5cd6cf3b1a5..00000000000
--- a/libjava/java/security/MessageDigest.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_MessageDigest__
-#define __java_security_MessageDigest__
-
-#pragma interface
-
-#include <java/security/MessageDigestSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class MessageDigest;
-        class Provider;
-    }
-  }
-}
-
-class java::security::MessageDigest : public ::java::security::MessageDigestSpi
-{
-
-public: // actually protected
-  MessageDigest(::java::lang::String *);
-public:
-  static ::java::security::MessageDigest * getInstance(::java::lang::String *);
-  static ::java::security::MessageDigest * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::MessageDigest * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual void update(JArray< jbyte > *);
-  virtual void update(::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * digest();
-  virtual jint digest(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest(JArray< jbyte > *);
-  virtual ::java::lang::String * toString();
-  static jboolean isEqual(JArray< jbyte > *, JArray< jbyte > *);
-  virtual void reset();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual jint getDigestLength();
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::lang::String * digestToString();
-  static ::java::lang::String * MESSAGE_DIGEST;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::MessageDigestSpi)))) algorithm;
-public: // actually package-private
-  ::java::security::Provider * provider;
-private:
-  JArray< jbyte > * lastDigest;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_MessageDigest__
diff --git a/libjava/java/security/MessageDigestSpi.h b/libjava/java/security/MessageDigestSpi.h
deleted file mode 100644
index fea06bf497e..00000000000
--- a/libjava/java/security/MessageDigestSpi.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_MessageDigestSpi__
-#define __java_security_MessageDigestSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class MessageDigestSpi;
-    }
-  }
-}
-
-class java::security::MessageDigestSpi : public ::java::lang::Object
-{
-
-public:
-  MessageDigestSpi();
-public: // actually protected
-  virtual jint engineGetDigestLength();
-  virtual void engineUpdate(jbyte) = 0;
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint) = 0;
-  virtual void engineUpdate(::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * engineDigest() = 0;
-  virtual jint engineDigest(JArray< jbyte > *, jint, jint);
-  virtual void engineReset() = 0;
-public:
-  virtual ::java::lang::Object * clone();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_MessageDigestSpi__
diff --git a/libjava/java/security/NoSuchAlgorithmException.h b/libjava/java/security/NoSuchAlgorithmException.h
deleted file mode 100644
index 413821e727a..00000000000
--- a/libjava/java/security/NoSuchAlgorithmException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_NoSuchAlgorithmException__
-#define __java_security_NoSuchAlgorithmException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class NoSuchAlgorithmException;
-    }
-  }
-}
-
-class java::security::NoSuchAlgorithmException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  NoSuchAlgorithmException();
-  NoSuchAlgorithmException(::java::lang::String *);
-  NoSuchAlgorithmException(::java::lang::String *, ::java::lang::Throwable *);
-  NoSuchAlgorithmException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -7443947487218346562LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_NoSuchAlgorithmException__
diff --git a/libjava/java/security/NoSuchProviderException.h b/libjava/java/security/NoSuchProviderException.h
deleted file mode 100644
index 16878c33712..00000000000
--- a/libjava/java/security/NoSuchProviderException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_NoSuchProviderException__
-#define __java_security_NoSuchProviderException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class NoSuchProviderException;
-    }
-  }
-}
-
-class java::security::NoSuchProviderException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  NoSuchProviderException();
-  NoSuchProviderException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8488111756688534474LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_NoSuchProviderException__
diff --git a/libjava/java/security/Permission.h b/libjava/java/security/Permission.h
deleted file mode 100644
index c565f2b58e9..00000000000
--- a/libjava/java/security/Permission.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Permission__
-#define __java_security_Permission__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::security::Permission : public ::java::lang::Object
-{
-
-public:
-  Permission(::java::lang::String *);
-  virtual void checkGuard(::java::lang::Object *);
-  virtual jboolean implies(::java::security::Permission *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getActions() = 0;
-  virtual ::java::security::PermissionCollection * newPermissionCollection();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5636570222231596674LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Permission__
diff --git a/libjava/java/security/PermissionCollection.h b/libjava/java/security/PermissionCollection.h
deleted file mode 100644
index 868c23e0e4e..00000000000
--- a/libjava/java/security/PermissionCollection.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PermissionCollection__
-#define __java_security_PermissionCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::security::PermissionCollection : public ::java::lang::Object
-{
-
-public:
-  PermissionCollection();
-  virtual void add(::java::security::Permission *) = 0;
-  virtual jboolean implies(::java::security::Permission *) = 0;
-  virtual ::java::util::Enumeration * elements() = 0;
-  virtual void setReadOnly();
-  virtual jboolean isReadOnly();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6727011328946861783LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_PermissionCollection__
diff --git a/libjava/java/security/Permissions$1.h b/libjava/java/security/Permissions$1.h
deleted file mode 100644
index 22e0e412fe7..00000000000
--- a/libjava/java/security/Permissions$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Permissions$1__
-#define __java_security_Permissions$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permissions;
-        class Permissions$1;
-    }
-  }
-}
-
-class java::security::Permissions$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Permissions$1(::java::security::Permissions *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) main_enum;
-  ::java::util::Enumeration * sub_enum;
-  ::java::security::Permissions * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Permissions$1__
diff --git a/libjava/java/security/Permissions$PermissionsHash.h b/libjava/java/security/Permissions$PermissionsHash.h
deleted file mode 100644
index 870065a4bd3..00000000000
--- a/libjava/java/security/Permissions$PermissionsHash.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Permissions$PermissionsHash__
-#define __java_security_Permissions$PermissionsHash__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class Permissions$PermissionsHash;
-    }
-  }
-}
-
-class java::security::Permissions$PermissionsHash : public ::java::security::PermissionCollection
-{
-
-  Permissions$PermissionsHash();
-public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-public: // actually package-private
-  Permissions$PermissionsHash(::java::security::Permissions$PermissionsHash *);
-private:
-  static const jlong serialVersionUID = -8491988220802933440LL;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) perms;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Permissions$PermissionsHash__
diff --git a/libjava/java/security/Permissions.h b/libjava/java/security/Permissions.h
deleted file mode 100644
index 5484fa980f9..00000000000
--- a/libjava/java/security/Permissions.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Permissions__
-#define __java_security_Permissions__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-        class Permissions;
-    }
-  }
-}
-
-class java::security::Permissions : public ::java::security::PermissionCollection
-{
-
-public:
-  Permissions();
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-private:
-  static const jlong serialVersionUID = 4858622370623524688LL;
-  ::java::security::PermissionCollection * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) allPermission;
-public: // actually package-private
-  ::java::util::Hashtable * perms;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Permissions__
diff --git a/libjava/java/security/Policy.h b/libjava/java/security/Policy.h
deleted file mode 100644
index 11620954484..00000000000
--- a/libjava/java/security/Policy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Policy__
-#define __java_security_Policy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class CodeSource;
-        class Permission;
-        class PermissionCollection;
-        class Policy;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::Policy : public ::java::lang::Object
-{
-
-public:
-  Policy();
-  static ::java::security::Policy * getPolicy();
-  static void setPolicy(::java::security::Policy *);
-private:
-  static void setup(::java::security::Policy *);
-public: // actually package-private
-  static ::java::security::Policy * getCurrentPolicy();
-  static jboolean isLoaded();
-public:
-  virtual ::java::security::PermissionCollection * getPermissions(::java::security::CodeSource *) = 0;
-  virtual ::java::security::PermissionCollection * getPermissions(::java::security::ProtectionDomain *);
-  virtual jboolean implies(::java::security::ProtectionDomain *, ::java::security::Permission *);
-  virtual void refresh() = 0;
-private:
-  static ::java::security::Policy * currentPolicy;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pd2pc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Policy__
diff --git a/libjava/java/security/Principal.h b/libjava/java/security/Principal.h
deleted file mode 100644
index e3cfb312677..00000000000
--- a/libjava/java/security/Principal.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Principal__
-#define __java_security_Principal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-    }
-  }
-}
-
-class java::security::Principal : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_Principal__
diff --git a/libjava/java/security/PrivateKey.h b/libjava/java/security/PrivateKey.h
deleted file mode 100644
index 2be7e63955e..00000000000
--- a/libjava/java/security/PrivateKey.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PrivateKey__
-#define __java_security_PrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-    }
-  }
-}
-
-class java::security::PrivateKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 6034044314589513430LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_PrivateKey__
diff --git a/libjava/java/security/PrivilegedAction.h b/libjava/java/security/PrivilegedAction.h
deleted file mode 100644
index 17481fd002a..00000000000
--- a/libjava/java/security/PrivilegedAction.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PrivilegedAction__
-#define __java_security_PrivilegedAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedAction;
-    }
-  }
-}
-
-class java::security::PrivilegedAction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * run() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_PrivilegedAction__
diff --git a/libjava/java/security/PrivilegedActionException.h b/libjava/java/security/PrivilegedActionException.h
deleted file mode 100644
index 165a1c59752..00000000000
--- a/libjava/java/security/PrivilegedActionException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PrivilegedActionException__
-#define __java_security_PrivilegedActionException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedActionException;
-    }
-  }
-}
-
-class java::security::PrivilegedActionException : public ::java::lang::Exception
-{
-
-public:
-  PrivilegedActionException(::java::lang::Exception *);
-  virtual ::java::lang::Exception * getException();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4724086851538908602LL;
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_PrivilegedActionException__
diff --git a/libjava/java/security/PrivilegedExceptionAction.h b/libjava/java/security/PrivilegedExceptionAction.h
deleted file mode 100644
index bfb3046e567..00000000000
--- a/libjava/java/security/PrivilegedExceptionAction.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PrivilegedExceptionAction__
-#define __java_security_PrivilegedExceptionAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedExceptionAction;
-    }
-  }
-}
-
-class java::security::PrivilegedExceptionAction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * run() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_PrivilegedExceptionAction__
diff --git a/libjava/java/security/ProtectionDomain.h b/libjava/java/security/ProtectionDomain.h
deleted file mode 100644
index bb2430be166..00000000000
--- a/libjava/java/security/ProtectionDomain.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_ProtectionDomain__
-#define __java_security_ProtectionDomain__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class CodeSource;
-        class Permission;
-        class PermissionCollection;
-        class Principal;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::ProtectionDomain : public ::java::lang::Object
-{
-
-public:
-  ProtectionDomain(::java::security::CodeSource *, ::java::security::PermissionCollection *);
-  ProtectionDomain(::java::security::CodeSource *, ::java::security::PermissionCollection *, ::java::lang::ClassLoader *, JArray< ::java::security::Principal * > *);
-private:
-  ProtectionDomain(::java::security::CodeSource *, ::java::security::PermissionCollection *, ::java::lang::ClassLoader *, JArray< ::java::security::Principal * > *, jboolean);
-public:
-  virtual ::java::security::CodeSource * getCodeSource();
-  virtual ::java::lang::ClassLoader * getClassLoader();
-  virtual JArray< ::java::security::Principal * > * getPrincipals();
-  virtual ::java::security::PermissionCollection * getPermissions();
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::security::CodeSource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) code_source;
-  ::java::security::PermissionCollection * perms;
-  ::java::lang::ClassLoader * classloader;
-  JArray< ::java::security::Principal * > * principals;
-  jboolean staticBinding;
-  jboolean hasAllPermissions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_ProtectionDomain__
diff --git a/libjava/java/security/Provider.h b/libjava/java/security/Provider.h
deleted file mode 100644
index 5954805f8d0..00000000000
--- a/libjava/java/security/Provider.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Provider__
-#define __java_security_Provider__
-
-#pragma interface
-
-#include <java/util/Properties.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-    }
-  }
-}
-
-class java::security::Provider : public ::java::util::Properties
-{
-
-public: // actually protected
-  Provider(::java::lang::String *, jdouble, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual jdouble getVersion();
-  virtual ::java::lang::String * getInfo();
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual void clear();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Object * toCanonicalKey(::java::lang::Object *);
-  static const jlong serialVersionUID = -4298000515446427739LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::Properties)))) info;
-  ::java::lang::String * name;
-  jdouble version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Provider__
diff --git a/libjava/java/security/ProviderException.h b/libjava/java/security/ProviderException.h
deleted file mode 100644
index 843a100abdf..00000000000
--- a/libjava/java/security/ProviderException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_ProviderException__
-#define __java_security_ProviderException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class ProviderException;
-    }
-  }
-}
-
-class java::security::ProviderException : public ::java::lang::RuntimeException
-{
-
-public:
-  ProviderException();
-  ProviderException(::java::lang::String *);
-  ProviderException(::java::lang::String *, ::java::lang::Throwable *);
-  ProviderException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 5256023526693665674LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_ProviderException__
diff --git a/libjava/java/security/PublicKey.h b/libjava/java/security/PublicKey.h
deleted file mode 100644
index 6a2a72bd89a..00000000000
--- a/libjava/java/security/PublicKey.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PublicKey__
-#define __java_security_PublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::PublicKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 7187392471159151072LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_PublicKey__
diff --git a/libjava/java/security/SecureClassLoader.h b/libjava/java/security/SecureClassLoader.h
deleted file mode 100644
index c8431a7bc7f..00000000000
--- a/libjava/java/security/SecureClassLoader.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SecureClassLoader__
-#define __java_security_SecureClassLoader__
-
-#pragma interface
-
-#include <java/lang/ClassLoader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class CodeSource;
-        class PermissionCollection;
-        class ProtectionDomain;
-        class SecureClassLoader;
-    }
-  }
-}
-
-class java::security::SecureClassLoader : public ::java::lang::ClassLoader
-{
-
-public: // actually protected
-  SecureClassLoader(::java::lang::ClassLoader *);
-  SecureClassLoader();
-  virtual ::java::lang::Class * defineClass(::java::lang::String *, JArray< jbyte > *, jint, jint, ::java::security::CodeSource *);
-  virtual ::java::lang::Class * defineClass(::java::lang::String *, ::java::nio::ByteBuffer *, ::java::security::CodeSource *);
-private:
-  ::java::security::ProtectionDomain * getProtectionDomain(::java::security::CodeSource *);
-public: // actually protected
-  virtual ::java::security::PermissionCollection * getPermissions(::java::security::CodeSource *);
-private:
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::ClassLoader)))) protectionDomainCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SecureClassLoader__
diff --git a/libjava/java/security/SecureRandom.h b/libjava/java/security/SecureRandom.h
deleted file mode 100644
index b54318c4406..00000000000
--- a/libjava/java/security/SecureRandom.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SecureRandom__
-#define __java_security_SecureRandom__
-
-#pragma interface
-
-#include <java/util/Random.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-        class SecureRandom;
-        class SecureRandomSpi;
-    }
-  }
-}
-
-class java::security::SecureRandom : public ::java::util::Random
-{
-
-public:
-  SecureRandom();
-  SecureRandom(JArray< jbyte > *);
-public: // actually protected
-  SecureRandom(::java::security::SecureRandomSpi *, ::java::security::Provider *);
-private:
-  SecureRandom(::java::security::SecureRandomSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::security::SecureRandom * getInstance(::java::lang::String *);
-  static ::java::security::SecureRandom * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::SecureRandom * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual void setSeed(JArray< jbyte > *);
-  virtual void setSeed(jlong);
-  virtual void nextBytes(JArray< jbyte > *);
-public: // actually protected
-  virtual jint next(jint);
-public:
-  static JArray< jbyte > * getSeed(jint);
-  virtual JArray< jbyte > * generateSeed(jint);
-private:
-  static ::java::lang::String * SECURE_RANDOM;
-  static const jlong serialVersionUID = 4940670005562187LL;
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::util::Random)))) counter;
-  ::java::security::Provider * provider;
-  JArray< jbyte > * randomBytes;
-  jint randomBytesUsed;
-  ::java::security::SecureRandomSpi * secureRandomSpi;
-  JArray< jbyte > * state;
-private:
-  ::java::lang::String * algorithm;
-  jboolean isSeeded;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SecureRandom__
diff --git a/libjava/java/security/SecureRandomSpi.h b/libjava/java/security/SecureRandomSpi.h
deleted file mode 100644
index 8b2b6d7d1da..00000000000
--- a/libjava/java/security/SecureRandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SecureRandomSpi__
-#define __java_security_SecureRandomSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandomSpi;
-    }
-  }
-}
-
-class java::security::SecureRandomSpi : public ::java::lang::Object
-{
-
-public:
-  SecureRandomSpi();
-public: // actually protected
-  virtual void engineSetSeed(JArray< jbyte > *) = 0;
-  virtual void engineNextBytes(JArray< jbyte > *) = 0;
-  virtual JArray< jbyte > * engineGenerateSeed(jint) = 0;
-private:
-  static const jlong serialVersionUID = -2991854161009191830LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SecureRandomSpi__
diff --git a/libjava/java/security/Security.h b/libjava/java/security/Security.h
deleted file mode 100644
index 201c9957ded..00000000000
--- a/libjava/java/security/Security.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Security__
-#define __java_security_Security__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-        class Security;
-    }
-  }
-}
-
-class java::security::Security : public ::java::lang::Object
-{
-
-  Security();
-  static jboolean loadProviders(::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::lang::String * getAlgorithmProperty(::java::lang::String *, ::java::lang::String *);
-  static jint insertProviderAt(::java::security::Provider *, jint);
-  static jint addProvider(::java::security::Provider *);
-  static void removeProvider(::java::lang::String *);
-  static JArray< ::java::security::Provider * > * getProviders();
-  static ::java::security::Provider * getProvider(::java::lang::String *);
-  static ::java::lang::String * getProperty(::java::lang::String *);
-  static void setProperty(::java::lang::String *, ::java::lang::String *);
-  static ::java::util::Set * getAlgorithms(::java::lang::String *);
-  static JArray< ::java::security::Provider * > * getProviders(::java::lang::String *);
-  static JArray< ::java::security::Provider * > * getProviders(::java::util::Map *);
-private:
-  static void selectProviders(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::LinkedHashSet *, ::java::util::LinkedHashSet *);
-  static jboolean provides(::java::security::Provider *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * ALG_ALIAS;
-  static ::java::util::Vector * providers;
-  static ::java::util::Properties * secprops;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Security__
diff --git a/libjava/java/security/SecurityPermission.h b/libjava/java/security/SecurityPermission.h
deleted file mode 100644
index c28bdc6307d..00000000000
--- a/libjava/java/security/SecurityPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SecurityPermission__
-#define __java_security_SecurityPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecurityPermission;
-    }
-  }
-}
-
-class java::security::SecurityPermission : public ::java::security::BasicPermission
-{
-
-public:
-  SecurityPermission(::java::lang::String *);
-  SecurityPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5236109936224050470LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SecurityPermission__
diff --git a/libjava/java/security/Signature.h b/libjava/java/security/Signature.h
deleted file mode 100644
index 43f4d5233f0..00000000000
--- a/libjava/java/security/Signature.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Signature__
-#define __java_security_Signature__
-
-#pragma interface
-
-#include <java/security/SignatureSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class PrivateKey;
-        class Provider;
-        class PublicKey;
-        class SecureRandom;
-        class Signature;
-      namespace cert
-      {
-          class Certificate;
-      }
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::Signature : public ::java::security::SignatureSpi
-{
-
-public: // actually protected
-  Signature(::java::lang::String *);
-public:
-  static ::java::security::Signature * getInstance(::java::lang::String *);
-  static ::java::security::Signature * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::Signature * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void initVerify(::java::security::PublicKey *);
-  virtual void initVerify(::java::security::cert::Certificate *);
-  virtual void initSign(::java::security::PrivateKey *);
-  virtual void initSign(::java::security::PrivateKey *, ::java::security::SecureRandom *);
-  virtual JArray< jbyte > * sign();
-  virtual jint sign(JArray< jbyte > *, jint, jint);
-  virtual jboolean verify(JArray< jbyte > *);
-  virtual jboolean verify(JArray< jbyte > *, jint, jint);
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual void update(::java::nio::ByteBuffer *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * toString();
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual void setParameter(::java::security::spec::AlgorithmParameterSpec *);
-  virtual ::java::security::AlgorithmParameters * getParameters();
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-private:
-  static ::java::lang::String * SIGNATURE;
-public: // actually protected
-  static const jint UNINITIALIZED = 0;
-  static const jint SIGN = 2;
-  static const jint VERIFY = 3;
-  jint __attribute__((aligned(__alignof__( ::java::security::SignatureSpi)))) state;
-private:
-  ::java::lang::String * algorithm;
-public: // actually package-private
-  ::java::security::Provider * provider;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Signature__
diff --git a/libjava/java/security/SignatureException.h b/libjava/java/security/SignatureException.h
deleted file mode 100644
index 32e3d756270..00000000000
--- a/libjava/java/security/SignatureException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SignatureException__
-#define __java_security_SignatureException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SignatureException;
-    }
-  }
-}
-
-class java::security::SignatureException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  SignatureException();
-  SignatureException(::java::lang::String *);
-  SignatureException(::java::lang::String *, ::java::lang::Throwable *);
-  SignatureException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 7509989324975124438LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SignatureException__
diff --git a/libjava/java/security/SignatureSpi.h b/libjava/java/security/SignatureSpi.h
deleted file mode 100644
index 7e2406e5aac..00000000000
--- a/libjava/java/security/SignatureSpi.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SignatureSpi__
-#define __java_security_SignatureSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class PrivateKey;
-        class PublicKey;
-        class SecureRandom;
-        class SignatureSpi;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::SignatureSpi : public ::java::lang::Object
-{
-
-public:
-  SignatureSpi();
-public: // actually protected
-  virtual void engineInitVerify(::java::security::PublicKey *) = 0;
-  virtual void engineInitSign(::java::security::PrivateKey *) = 0;
-  virtual void engineInitSign(::java::security::PrivateKey *, ::java::security::SecureRandom *);
-  virtual void engineUpdate(jbyte) = 0;
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint) = 0;
-  virtual void engineUpdate(::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * engineSign() = 0;
-  virtual jint engineSign(JArray< jbyte > *, jint, jint);
-  virtual jboolean engineVerify(JArray< jbyte > *) = 0;
-  virtual jboolean engineVerify(JArray< jbyte > *, jint, jint);
-  virtual void engineSetParameter(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void engineSetParameter(::java::security::spec::AlgorithmParameterSpec *);
-  virtual ::java::security::AlgorithmParameters * engineGetParameters();
-  virtual ::java::lang::Object * engineGetParameter(::java::lang::String *) = 0;
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  ::java::security::SecureRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) appRandom;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SignatureSpi__
diff --git a/libjava/java/security/SignedObject.h b/libjava/java/security/SignedObject.h
deleted file mode 100644
index 430053721ba..00000000000
--- a/libjava/java/security/SignedObject.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SignedObject__
-#define __java_security_SignedObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-        class Signature;
-        class SignedObject;
-    }
-  }
-}
-
-class java::security::SignedObject : public ::java::lang::Object
-{
-
-public:
-  SignedObject(::java::io::Serializable *, ::java::security::PrivateKey *, ::java::security::Signature *);
-  ::java::lang::Object * getObject();
-  JArray< jbyte > * getSignature();
-  ::java::lang::String * getAlgorithm();
-  jboolean verify(::java::security::PublicKey *, ::java::security::Signature *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 720502720485447167LL;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
-  JArray< jbyte > * signature;
-  ::java::lang::String * thealgorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SignedObject__
diff --git a/libjava/java/security/Signer.h b/libjava/java/security/Signer.h
deleted file mode 100644
index 080bc8a0b61..00000000000
--- a/libjava/java/security/Signer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Signer__
-#define __java_security_Signer__
-
-#pragma interface
-
-#include <java/security/Identity.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class IdentityScope;
-        class KeyPair;
-        class PrivateKey;
-        class Signer;
-    }
-  }
-}
-
-class java::security::Signer : public ::java::security::Identity
-{
-
-public: // actually protected
-  Signer();
-public:
-  Signer(::java::lang::String *);
-  Signer(::java::lang::String *, ::java::security::IdentityScope *);
-  virtual ::java::security::PrivateKey * getPrivateKey();
-  virtual void setKeyPair(::java::security::KeyPair *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1763464102261361480LL;
-  ::java::security::PrivateKey * __attribute__((aligned(__alignof__( ::java::security::Identity)))) privateKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Signer__
diff --git a/libjava/java/security/UnrecoverableKeyException.h b/libjava/java/security/UnrecoverableKeyException.h
deleted file mode 100644
index 51c0c8a0115..00000000000
--- a/libjava/java/security/UnrecoverableKeyException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_UnrecoverableKeyException__
-#define __java_security_UnrecoverableKeyException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class UnrecoverableKeyException;
-    }
-  }
-}
-
-class java::security::UnrecoverableKeyException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  UnrecoverableKeyException();
-  UnrecoverableKeyException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7275063078190151277LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_UnrecoverableKeyException__
diff --git a/libjava/java/security/UnresolvedPermission.h b/libjava/java/security/UnresolvedPermission.h
deleted file mode 100644
index ceebc5b72aa..00000000000
--- a/libjava/java/security/UnresolvedPermission.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_UnresolvedPermission__
-#define __java_security_UnresolvedPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-        class UnresolvedPermission;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::UnresolvedPermission : public ::java::security::Permission
-{
-
-public:
-  UnresolvedPermission(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::security::cert::Certificate * > *);
-  jboolean implies(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * getActions();
-  ::java::lang::String * toString();
-  ::java::security::PermissionCollection * newPermissionCollection();
-  ::java::lang::String * getUnresolvedType();
-  ::java::lang::String * getUnresolvedName();
-  ::java::lang::String * getUnresolvedActions();
-  JArray< ::java::security::cert::Certificate * > * getUnresolvedCerts();
-private:
-  static const jlong serialVersionUID = -4821973115467008846LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::Permission)))) actions;
-  JArray< ::java::security::cert::Certificate * > * certs;
-public: // actually package-private
-  ::java::lang::String * type;
-private:
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_UnresolvedPermission__
diff --git a/libjava/java/security/UnresolvedPermissionCollection$1.h b/libjava/java/security/UnresolvedPermissionCollection$1.h
deleted file mode 100644
index 2e753785813..00000000000
--- a/libjava/java/security/UnresolvedPermissionCollection$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_UnresolvedPermissionCollection$1__
-#define __java_security_UnresolvedPermissionCollection$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class UnresolvedPermissionCollection;
-        class UnresolvedPermissionCollection$1;
-    }
-  }
-}
-
-class java::security::UnresolvedPermissionCollection$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UnresolvedPermissionCollection$1(::java::security::UnresolvedPermissionCollection *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) main_enum;
-  ::java::util::Enumeration * sub_enum;
-  ::java::security::UnresolvedPermissionCollection * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_UnresolvedPermissionCollection$1__
diff --git a/libjava/java/security/UnresolvedPermissionCollection.h b/libjava/java/security/UnresolvedPermissionCollection.h
deleted file mode 100644
index 2d31d0e6cf8..00000000000
--- a/libjava/java/security/UnresolvedPermissionCollection.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_UnresolvedPermissionCollection__
-#define __java_security_UnresolvedPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class UnresolvedPermissionCollection;
-    }
-  }
-}
-
-class java::security::UnresolvedPermissionCollection : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  UnresolvedPermissionCollection();
-public:
-  virtual void add(::java::security::Permission *);
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::util::Enumeration * elements();
-private:
-  static const jlong serialVersionUID = -7176153071733132400LL;
-public: // actually package-private
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_UnresolvedPermissionCollection__
diff --git a/libjava/java/security/VMAccessControlState.h b/libjava/java/security/VMAccessControlState.h
deleted file mode 100644
index 5c71033ca7c..00000000000
--- a/libjava/java/security/VMAccessControlState.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_VMAccessControlState__
-#define __java_security_VMAccessControlState__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class VMAccessControlState;
-    }
-  }
-}
-
-class java::security::VMAccessControlState : public ::java::lang::Object
-{
-
-  VMAccessControlState();
-public: // actually package-private
-  static ::java::security::VMAccessControlState * getThreadState();
-  virtual jboolean isInGetContext();
-  virtual void setInGetContext(jboolean);
-  virtual ::java::util::LinkedList * getContexts();
-private:
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) contexts;
-  jboolean inGetContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_VMAccessControlState__
diff --git a/libjava/java/security/VMAccessControlState.java b/libjava/java/security/VMAccessControlState.java
deleted file mode 100644
index 360f08a5b6b..00000000000
--- a/libjava/java/security/VMAccessControlState.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* VMAccessControlState.java -- per-thread state for the access controller.
-   Copyright (C) 2006 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package java.security;
-
-import java.util.LinkedList;
-
-class VMAccessControlState
-{
-  /**
-   * A list of {@link AccessControlContext} objects (which can be
-   * null) for each call to {@link AccessController#doPrivileged()} in
-   * the thread's call stack.
-   */
-  private LinkedList contexts = new LinkedList();
-
-  /**
-   * A flag indicating that we are within a call to {@link
-   * VMAccessController#getContext()}.
-   */
-  private boolean inGetContext = false;
-
-  /**
-   * Not directly instantiable: use getThreadState() instead.
-   */
-  private VMAccessControlState() {}
-
-  /**
-   * Return an object representing the access control state of this
-   * thread.
-   *
-   * @return The access control state of this thread, or
-   * <code>null</code> if the VM is not initialized to the point of
-   * being able to return this.
-   */
-  static native VMAccessControlState getThreadState();
-
-  /**
-   * Indicate whether this thread is within a call to {@link
-   * VMAccessController#getContext()}.
-   *
-   * @return <code>true</code> if this thread is within a call to
-   * {@link VMAccessController#getContext()}.
-   */
-  boolean isInGetContext()
-  {
-    return inGetContext;
-  }
-
-  /**
-   * Specify whether this thread is within a call to {@link
-   * VMAccessController#getContext()}.
-   */
-  void setInGetContext(boolean inGetContext)
-  {
-    this.inGetContext = inGetContext;
-  }
-  
-  /**
-   * Return a list of {@link AccessControlContext} objects (which can
-   * be null) for each call to {@link AccessController#doPrivileged()}
-   * in the thread's call stack.
-   *
-   * @return a list of {@link AccessControlContext} objects.
-   */
-  LinkedList getContexts()
-  {
-    return contexts;
-  }
-}
diff --git a/libjava/java/security/VMAccessController.h b/libjava/java/security/VMAccessController.h
deleted file mode 100644
index 20cd9ce7338..00000000000
--- a/libjava/java/security/VMAccessController.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_VMAccessController__
-#define __java_security_VMAccessController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-        class VMAccessController;
-    }
-  }
-}
-
-class java::security::VMAccessController : public ::java::lang::Object
-{
-
-  static void debug(::java::lang::String *);
-  VMAccessController();
-public: // actually package-private
-  static void pushContext(::java::security::AccessControlContext *);
-  static void popContext();
-  static ::java::security::AccessControlContext * getContext();
-private:
-  static JArray< ::java::lang::Object * > * getStack();
-  static ::java::security::AccessControlContext * DEFAULT_CONTEXT;
-  static jboolean DEBUG;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_VMAccessController__
diff --git a/libjava/java/security/VMAccessController.java b/libjava/java/security/VMAccessController.java
deleted file mode 100644
index 66ada195229..00000000000
--- a/libjava/java/security/VMAccessController.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/* VMAccessController.java -- VM-specific access controller methods.
-   Copyright (C) 2004, 2005, 2006, 2010  Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package java.security;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-
-final class VMAccessController
-{
-
-  // Fields.
-  // -------------------------------------------------------------------------
-
-  /**
-   * And we return this all-permissive context to ensure that privileged
-   * methods called from getContext succeed.
-   */
-  private static final AccessControlContext DEFAULT_CONTEXT;
-  static
-  {
-    CodeSource source = new CodeSource(null, null);
-    Permissions permissions = new Permissions();
-    permissions.add(new AllPermission());
-    ProtectionDomain[] domain = new ProtectionDomain[] {
-      new ProtectionDomain(source, permissions, null, null)
-    };
-    DEFAULT_CONTEXT = new AccessControlContext(domain);
-  }
-
-  private static final boolean DEBUG = gnu.classpath.Configuration.DEBUG;
-  private static void debug(String msg)
-  {
-    System.err.print(">>> VMAccessController: ");
-    System.err.println(msg);
-  }
-
-  // Constructors.
-  // -------------------------------------------------------------------------
-
-  private VMAccessController() { }
-
-  // Class methods.
-  // -------------------------------------------------------------------------
-
-  /**
-   * Relate a class (which should be an instance of {@link PrivilegedAction}
-   * with an access control context. This method is used by {@link
-   * AccessController#doPrivileged(java.security.PrivilegedAction,java.security.AccessControlContext)}
-   * to set up the context that will be returned by {@link #getContext()}.
-   * This method relates the class to the current thread, so contexts
-   * pushed from one thread will not be available to another.
-   *
-   * @param acc The access control context.
-   */
-  static void pushContext (AccessControlContext acc)
-  {
-    // Can't really do anything while the VM is initializing.
-    VMAccessControlState state = VMAccessControlState.getThreadState();
-    if (state == null)
-      return;
-
-    if (DEBUG)
-      debug("pushing " + acc);
-
-    LinkedList stack = state.getContexts();
-    stack.addFirst(acc);
-  }
-
-  /**
-   * Removes the relation of a class to an {@link AccessControlContext}.
-   * This method is used by {@link AccessController} when exiting from a
-   * call to {@link
-   * AccessController#doPrivileged(java.security.PrivilegedAction,java.security.AccessControlContext)}.
-   */
-  static void popContext()
-  {
-    // Can't really do anything while the VM is initializing.
-    VMAccessControlState state = VMAccessControlState.getThreadState();
-    if (state == null)
-      return;
-
-    if (DEBUG)
-      debug("popping context");
-
-    // Stack should never be null, nor should it be empty, if this method
-    // and its counterpart has been called properly.
-    LinkedList stack = state.getContexts();
-    if (!stack.isEmpty())
-      {
-        stack.removeFirst();
-      }
-    else if (DEBUG)
-      {
-        debug("no stack during pop?????");
-      }
-  }
-
-  /**
-   * Examine the method stack of the currently running thread, and create
-   * an {@link AccessControlContext} filled in with the appropriate {@link
-   * ProtectionDomain} objects given this stack.
-   *
-   * @return The context.
-   */
-  static AccessControlContext getContext()
-  {
-    // If the VM is initializing return the all-permissive context
-    // so that any security checks succeed.
-    VMAccessControlState state = VMAccessControlState.getThreadState();
-    if (state == null)
-      return DEFAULT_CONTEXT;
-
-    // If we are already in getContext, but called a method that needs
-    // a permission check, return the all-permissive context so methods
-    // called from here succeed.
-    //
-    // XXX is this necessary? We should verify if there are any calls in
-    // the stack below this method that require permission checks.
-    if (state.isInGetContext())
-      {
-        if (DEBUG)
-          debug("already in getContext");
-        return DEFAULT_CONTEXT;
-      }
-
-    state.setInGetContext(true);
-
-    Object[] stack = getStack();
-    Class[] classes = (Class[]) stack[0];
-    boolean privileged = ((Boolean) stack[1]).booleanValue();
-
-    if (DEBUG)
-      debug("got trace of length " + classes.length);
-
-    HashSet domains = new HashSet();
-    HashSet seenDomains = new HashSet();
-    AccessControlContext context = null;
-
-    // We walk down the stack, adding each ProtectionDomain for each
-    // class in the call stack. If we reach a call to doPrivileged,
-    // we don't add any more stack frames. We skip the first three stack
-    // frames, since they comprise the calls to getStack, getContext,
-    // and AccessController.getContext.
-    for (int i = 3; i < classes.length; i++)
-      {
-        Class clazz = classes[i];
-        ClassLoader loader = clazz.getClassLoader();
-
-        if (DEBUG)
-          {
-            debug("checking " + clazz);
-            // subject to getClassLoader RuntimePermission
-            debug("loader = " + loader);
-          }
-
-        if (privileged && i == classes.length - 2)
-          {
-            // If there was a call to doPrivileged with a supplied context,
-            // return that context. If using JAAS doAs*, it should be
-            // a context with a SubjectDomainCombiner
-            LinkedList l = state.getContexts();
-            if (!l.isEmpty())
-              context = (AccessControlContext) l.getFirst();
-          }
-
-        // subject to getProtectionDomain RuntimePermission
-        ProtectionDomain domain = clazz.getProtectionDomain();
-
-        if (domain == null)
-          continue;
-        if (seenDomains.contains(domain))
-          continue;
-        seenDomains.add(domain);
-
-        // Create a static snapshot of this domain, which may change over time
-        // if the current policy changes.
-        domains.add(new ProtectionDomain(domain.getCodeSource(),
-                                         domain.getPermissions(),
-                                         loader, null));
-      }
-
-    if (DEBUG)
-      debug("created domains: " + domains);
-
-    ProtectionDomain[] result = (ProtectionDomain[])
-      domains.toArray(new ProtectionDomain[domains.size()]);
-
-    if (context != null)
-      {
-        DomainCombiner dc = context.getDomainCombiner ();
-        // If the supplied context had no explicit DomainCombiner, use
-        // our private version, which computes the intersection of the
-        // context's domains with the derived set.
-        if (dc == null)
-          context = new AccessControlContext
-            (IntersectingDomainCombiner.SINGLETON.combine
-             (result, context.getProtectionDomains ()));
-        // Use the supplied DomainCombiner. This should be secure,
-        // because only trusted code may create an
-        // AccessControlContext with a custom DomainCombiner.
-        else
-          context = new AccessControlContext (result, context, dc);
-      }
-    // No context was supplied. Return the derived one.
-    else
-      context = new AccessControlContext (result);
-
-    state.setInGetContext(false);
-    return context;
-  }
-
-  /**
-   * Returns a snapshot of the current call stack as a two-element
-   * array. The first element is an array of classes in the call
-   * stack, and the second element is a boolean value indicating
-   * whether the trace stopped early because a call to doPrivileged
-   * was encountered.  If this boolean value is true then the call to
-   * doPrivileged will be the second-last frame in the returned trace.
-   *
-   * @return A snapshot of the current call stack.
-   */
-  private static native Object[] getStack();
-}
diff --git a/libjava/java/security/acl/Acl.h b/libjava/java/security/acl/Acl.h
deleted file mode 100644
index 82c8d6de784..00000000000
--- a/libjava/java/security/acl/Acl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_Acl__
-#define __java_security_acl_Acl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace acl
-      {
-          class Acl;
-          class AclEntry;
-          class Permission;
-      }
-    }
-  }
-}
-
-class java::security::acl::Acl : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::security::Principal *, ::java::lang::String *) = 0;
-  virtual jboolean addEntry(::java::security::Principal *, ::java::security::acl::AclEntry *) = 0;
-  virtual jboolean removeEntry(::java::security::Principal *, ::java::security::acl::AclEntry *) = 0;
-  virtual ::java::util::Enumeration * entries() = 0;
-  virtual jboolean checkPermission(::java::security::Principal *, ::java::security::acl::Permission *) = 0;
-  virtual ::java::util::Enumeration * getPermissions(::java::security::Principal *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual jboolean addOwner(::java::security::Principal *, ::java::security::Principal *) = 0;
-  virtual jboolean deleteOwner(::java::security::Principal *, ::java::security::Principal *) = 0;
-  virtual jboolean isOwner(::java::security::Principal *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_Acl__
diff --git a/libjava/java/security/acl/AclEntry.h b/libjava/java/security/acl/AclEntry.h
deleted file mode 100644
index 3b098b0f899..00000000000
--- a/libjava/java/security/acl/AclEntry.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_AclEntry__
-#define __java_security_acl_AclEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace acl
-      {
-          class AclEntry;
-          class Permission;
-      }
-    }
-  }
-}
-
-class java::security::acl::AclEntry : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::security::Principal * getPrincipal() = 0;
-  virtual jboolean setPrincipal(::java::security::Principal *) = 0;
-  virtual void setNegativePermissions() = 0;
-  virtual jboolean isNegative() = 0;
-  virtual jboolean addPermission(::java::security::acl::Permission *) = 0;
-  virtual jboolean removePermission(::java::security::acl::Permission *) = 0;
-  virtual jboolean checkPermission(::java::security::acl::Permission *) = 0;
-  virtual ::java::util::Enumeration * permissions() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_AclEntry__
diff --git a/libjava/java/security/acl/AclNotFoundException.h b/libjava/java/security/acl/AclNotFoundException.h
deleted file mode 100644
index 9daea6522fa..00000000000
--- a/libjava/java/security/acl/AclNotFoundException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_AclNotFoundException__
-#define __java_security_acl_AclNotFoundException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace acl
-      {
-          class AclNotFoundException;
-      }
-    }
-  }
-}
-
-class java::security::acl::AclNotFoundException : public ::java::lang::Exception
-{
-
-public:
-  AclNotFoundException();
-private:
-  static const jlong serialVersionUID = 5684295034092681791LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_acl_AclNotFoundException__
diff --git a/libjava/java/security/acl/Group.h b/libjava/java/security/acl/Group.h
deleted file mode 100644
index 780774d4119..00000000000
--- a/libjava/java/security/acl/Group.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_Group__
-#define __java_security_acl_Group__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace acl
-      {
-          class Group;
-      }
-    }
-  }
-}
-
-class java::security::acl::Group : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean addMember(::java::security::Principal *) = 0;
-  virtual jboolean removeMember(::java::security::Principal *) = 0;
-  virtual jboolean isMember(::java::security::Principal *) = 0;
-  virtual ::java::util::Enumeration * members() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_Group__
diff --git a/libjava/java/security/acl/LastOwnerException.h b/libjava/java/security/acl/LastOwnerException.h
deleted file mode 100644
index eb03366e040..00000000000
--- a/libjava/java/security/acl/LastOwnerException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_LastOwnerException__
-#define __java_security_acl_LastOwnerException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace acl
-      {
-          class LastOwnerException;
-      }
-    }
-  }
-}
-
-class java::security::acl::LastOwnerException : public ::java::lang::Exception
-{
-
-public:
-  LastOwnerException();
-private:
-  static const jlong serialVersionUID = -5141997548211140359LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_acl_LastOwnerException__
diff --git a/libjava/java/security/acl/NotOwnerException.h b/libjava/java/security/acl/NotOwnerException.h
deleted file mode 100644
index 627e4e57b98..00000000000
--- a/libjava/java/security/acl/NotOwnerException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_NotOwnerException__
-#define __java_security_acl_NotOwnerException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace acl
-      {
-          class NotOwnerException;
-      }
-    }
-  }
-}
-
-class java::security::acl::NotOwnerException : public ::java::lang::Exception
-{
-
-public:
-  NotOwnerException();
-private:
-  static const jlong serialVersionUID = -5555597911163362399LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_acl_NotOwnerException__
diff --git a/libjava/java/security/acl/Owner.h b/libjava/java/security/acl/Owner.h
deleted file mode 100644
index b8bc09bf25a..00000000000
--- a/libjava/java/security/acl/Owner.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_Owner__
-#define __java_security_acl_Owner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace acl
-      {
-          class Owner;
-      }
-    }
-  }
-}
-
-class java::security::acl::Owner : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean addOwner(::java::security::Principal *, ::java::security::Principal *) = 0;
-  virtual jboolean deleteOwner(::java::security::Principal *, ::java::security::Principal *) = 0;
-  virtual jboolean isOwner(::java::security::Principal *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_Owner__
diff --git a/libjava/java/security/acl/Permission.h b/libjava/java/security/acl/Permission.h
deleted file mode 100644
index f1c9b252563..00000000000
--- a/libjava/java/security/acl/Permission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_Permission__
-#define __java_security_acl_Permission__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace acl
-      {
-          class Permission;
-      }
-    }
-  }
-}
-
-class java::security::acl::Permission : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_Permission__
diff --git a/libjava/java/security/cert/CRL.h b/libjava/java/security/cert/CRL.h
deleted file mode 100644
index e1b5298e023..00000000000
--- a/libjava/java/security/cert/CRL.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CRL__
-#define __java_security_cert_CRL__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::CRL : public ::java::lang::Object
-{
-
-public: // actually protected
-  CRL(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::String * toString() = 0;
-  virtual jboolean isRevoked(::java::security::cert::Certificate *) = 0;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CRL__
diff --git a/libjava/java/security/cert/CRLException.h b/libjava/java/security/cert/CRLException.h
deleted file mode 100644
index 7e2401eb484..00000000000
--- a/libjava/java/security/cert/CRLException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CRLException__
-#define __java_security_cert_CRLException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRLException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CRLException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CRLException();
-  CRLException(::java::lang::String *);
-  CRLException(::java::lang::String *, ::java::lang::Throwable *);
-  CRLException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -6694728944094197147LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CRLException__
diff --git a/libjava/java/security/cert/CRLSelector.h b/libjava/java/security/cert/CRLSelector.h
deleted file mode 100644
index fb5fe7a62a0..00000000000
--- a/libjava/java/security/cert/CRLSelector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CRLSelector__
-#define __java_security_cert_CRLSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class CRLSelector;
-      }
-    }
-  }
-}
-
-class java::security::cert::CRLSelector : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean match(::java::security::cert::CRL *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CRLSelector__
diff --git a/libjava/java/security/cert/CertPath$CertPathRep.h b/libjava/java/security/cert/CertPath$CertPathRep.h
deleted file mode 100644
index a688e1b6d78..00000000000
--- a/libjava/java/security/cert/CertPath$CertPathRep.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPath$CertPathRep__
-#define __java_security_cert_CertPath$CertPathRep__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath$CertPathRep;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPath$CertPathRep : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertPath$CertPathRep(::java::lang::String *, JArray< jbyte > *);
-  virtual ::java::lang::Object * readResolve();
-private:
-  static const jlong serialVersionUID = 3015633072427920915LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPath$CertPathRep__
diff --git a/libjava/java/security/cert/CertPath.h b/libjava/java/security/cert/CertPath.h
deleted file mode 100644
index ed7378982b8..00000000000
--- a/libjava/java/security/cert/CertPath.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPath__
-#define __java_security_cert_CertPath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPath : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertPath(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual ::java::util::Iterator * getEncodings() = 0;
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual JArray< jbyte > * getEncoded(::java::lang::String *) = 0;
-  virtual ::java::util::List * getCertificates() = 0;
-public: // actually protected
-  virtual ::java::lang::Object * writeReplace();
-private:
-  static const jlong serialVersionUID = 6068470306649138683LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPath__
diff --git a/libjava/java/security/cert/CertPathBuilder.h b/libjava/java/security/cert/CertPathBuilder.h
deleted file mode 100644
index 2905f742308..00000000000
--- a/libjava/java/security/cert/CertPathBuilder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathBuilder__
-#define __java_security_cert_CertPathBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace cert
-      {
-          class CertPathBuilder;
-          class CertPathBuilderResult;
-          class CertPathBuilderSpi;
-          class CertPathParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathBuilder : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertPathBuilder(::java::security::cert::CertPathBuilderSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::lang::String * getDefaultType();
-  static ::java::security::cert::CertPathBuilder * getInstance(::java::lang::String *);
-  static ::java::security::cert::CertPathBuilder * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::cert::CertPathBuilder * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::security::cert::CertPathBuilderResult * build(::java::security::cert::CertPathParameters *);
-private:
-  static ::java::lang::String * CERT_PATH_BUILDER;
-  ::java::security::cert::CertPathBuilderSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cpbSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathBuilder__
diff --git a/libjava/java/security/cert/CertPathBuilderException.h b/libjava/java/security/cert/CertPathBuilderException.h
deleted file mode 100644
index c2cb71b8f8c..00000000000
--- a/libjava/java/security/cert/CertPathBuilderException.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathBuilderException__
-#define __java_security_cert_CertPathBuilderException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathBuilderException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathBuilderException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CertPathBuilderException();
-  CertPathBuilderException(::java::lang::String *);
-  CertPathBuilderException(::java::lang::Throwable *);
-  CertPathBuilderException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = 5316471420178794402LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathBuilderException__
diff --git a/libjava/java/security/cert/CertPathBuilderResult.h b/libjava/java/security/cert/CertPathBuilderResult.h
deleted file mode 100644
index 74849e8df09..00000000000
--- a/libjava/java/security/cert/CertPathBuilderResult.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathBuilderResult__
-#define __java_security_cert_CertPathBuilderResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath;
-          class CertPathBuilderResult;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathBuilderResult : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  virtual ::java::security::cert::CertPath * getCertPath() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertPathBuilderResult__
diff --git a/libjava/java/security/cert/CertPathBuilderSpi.h b/libjava/java/security/cert/CertPathBuilderSpi.h
deleted file mode 100644
index 8b9524a5ac2..00000000000
--- a/libjava/java/security/cert/CertPathBuilderSpi.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathBuilderSpi__
-#define __java_security_cert_CertPathBuilderSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathBuilderResult;
-          class CertPathBuilderSpi;
-          class CertPathParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathBuilderSpi : public ::java::lang::Object
-{
-
-public:
-  CertPathBuilderSpi();
-  virtual ::java::security::cert::CertPathBuilderResult * engineBuild(::java::security::cert::CertPathParameters *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathBuilderSpi__
diff --git a/libjava/java/security/cert/CertPathParameters.h b/libjava/java/security/cert/CertPathParameters.h
deleted file mode 100644
index a6752dfaebc..00000000000
--- a/libjava/java/security/cert/CertPathParameters.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathParameters__
-#define __java_security_cert_CertPathParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathParameters : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertPathParameters__
diff --git a/libjava/java/security/cert/CertPathValidator$1.h b/libjava/java/security/cert/CertPathValidator$1.h
deleted file mode 100644
index 162f3d3bc35..00000000000
--- a/libjava/java/security/cert/CertPathValidator$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidator$1__
-#define __java_security_cert_CertPathValidator$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathValidator$1;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidator$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CertPathValidator$1();
-public:
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathValidator$1__
diff --git a/libjava/java/security/cert/CertPathValidator.h b/libjava/java/security/cert/CertPathValidator.h
deleted file mode 100644
index 4424264fc72..00000000000
--- a/libjava/java/security/cert/CertPathValidator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidator__
-#define __java_security_cert_CertPathValidator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace cert
-      {
-          class CertPath;
-          class CertPathParameters;
-          class CertPathValidator;
-          class CertPathValidatorResult;
-          class CertPathValidatorSpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidator : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertPathValidator(::java::security::cert::CertPathValidatorSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::lang::String * getDefaultType();
-  static ::java::security::cert::CertPathValidator * getInstance(::java::lang::String *);
-  static ::java::security::cert::CertPathValidator * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::cert::CertPathValidator * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::security::cert::CertPathValidatorResult * validate(::java::security::cert::CertPath *, ::java::security::cert::CertPathParameters *);
-private:
-  static ::java::lang::String * CERT_PATH_VALIDATOR;
-  ::java::security::cert::CertPathValidatorSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) validatorSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathValidator__
diff --git a/libjava/java/security/cert/CertPathValidatorException.h b/libjava/java/security/cert/CertPathValidatorException.h
deleted file mode 100644
index 14289c79aab..00000000000
--- a/libjava/java/security/cert/CertPathValidatorException.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidatorException__
-#define __java_security_cert_CertPathValidatorException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath;
-          class CertPathValidatorException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidatorException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CertPathValidatorException();
-  CertPathValidatorException(::java::lang::String *);
-  CertPathValidatorException(::java::lang::Throwable *);
-  CertPathValidatorException(::java::lang::String *, ::java::lang::Throwable *);
-  CertPathValidatorException(::java::lang::String *, ::java::lang::Throwable *, ::java::security::cert::CertPath *, jint);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::security::cert::CertPath * getCertPath();
-  virtual jint getIndex();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = -3083180014971893139LL;
-  jint __attribute__((aligned(__alignof__( ::java::security::GeneralSecurityException)))) index;
-  ::java::security::cert::CertPath * certPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathValidatorException__
diff --git a/libjava/java/security/cert/CertPathValidatorResult.h b/libjava/java/security/cert/CertPathValidatorResult.h
deleted file mode 100644
index 1a453205dd6..00000000000
--- a/libjava/java/security/cert/CertPathValidatorResult.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidatorResult__
-#define __java_security_cert_CertPathValidatorResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathValidatorResult;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidatorResult : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertPathValidatorResult__
diff --git a/libjava/java/security/cert/CertPathValidatorSpi.h b/libjava/java/security/cert/CertPathValidatorSpi.h
deleted file mode 100644
index cb737ef6402..00000000000
--- a/libjava/java/security/cert/CertPathValidatorSpi.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidatorSpi__
-#define __java_security_cert_CertPathValidatorSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath;
-          class CertPathParameters;
-          class CertPathValidatorResult;
-          class CertPathValidatorSpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidatorSpi : public ::java::lang::Object
-{
-
-public:
-  CertPathValidatorSpi();
-  virtual ::java::security::cert::CertPathValidatorResult * engineValidate(::java::security::cert::CertPath *, ::java::security::cert::CertPathParameters *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathValidatorSpi__
diff --git a/libjava/java/security/cert/CertSelector.h b/libjava/java/security/cert/CertSelector.h
deleted file mode 100644
index 2288bcc29be..00000000000
--- a/libjava/java/security/cert/CertSelector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertSelector__
-#define __java_security_cert_CertSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertSelector;
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertSelector : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean match(::java::security::cert::Certificate *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertSelector__
diff --git a/libjava/java/security/cert/CertStore$1.h b/libjava/java/security/cert/CertStore$1.h
deleted file mode 100644
index 9268dcd79dd..00000000000
--- a/libjava/java/security/cert/CertStore$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStore$1__
-#define __java_security_cert_CertStore$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertStore$1;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStore$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CertStore$1();
-public:
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertStore$1__
diff --git a/libjava/java/security/cert/CertStore.h b/libjava/java/security/cert/CertStore.h
deleted file mode 100644
index af7e7488c6f..00000000000
--- a/libjava/java/security/cert/CertStore.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStore__
-#define __java_security_cert_CertStore__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace cert
-      {
-          class CRLSelector;
-          class CertSelector;
-          class CertStore;
-          class CertStoreParameters;
-          class CertStoreSpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStore : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertStore(::java::security::cert::CertStoreSpi *, ::java::security::Provider *, ::java::lang::String *, ::java::security::cert::CertStoreParameters *);
-public:
-  static ::java::lang::String * getDefaultType();
-  static ::java::security::cert::CertStore * getInstance(::java::lang::String *, ::java::security::cert::CertStoreParameters *);
-  static ::java::security::cert::CertStore * getInstance(::java::lang::String *, ::java::security::cert::CertStoreParameters *, ::java::lang::String *);
-  static ::java::security::cert::CertStore * getInstance(::java::lang::String *, ::java::security::cert::CertStoreParameters *, ::java::security::Provider *);
-  virtual ::java::lang::String * getType();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::security::cert::CertStoreParameters * getCertStoreParameters();
-  virtual ::java::util::Collection * getCertificates(::java::security::cert::CertSelector *);
-  virtual ::java::util::Collection * getCRLs(::java::security::cert::CRLSelector *);
-private:
-  static ::java::lang::String * CERT_STORE;
-  ::java::security::cert::CertStoreSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) storeSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * type;
-  ::java::security::cert::CertStoreParameters * params;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertStore__
diff --git a/libjava/java/security/cert/CertStoreException.h b/libjava/java/security/cert/CertStoreException.h
deleted file mode 100644
index 72e42f9ab40..00000000000
--- a/libjava/java/security/cert/CertStoreException.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStoreException__
-#define __java_security_cert_CertStoreException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertStoreException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStoreException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CertStoreException();
-  CertStoreException(::java::lang::String *);
-  CertStoreException(::java::lang::Throwable *);
-  CertStoreException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = 2395296107471573245LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertStoreException__
diff --git a/libjava/java/security/cert/CertStoreParameters.h b/libjava/java/security/cert/CertStoreParameters.h
deleted file mode 100644
index 57eda812d76..00000000000
--- a/libjava/java/security/cert/CertStoreParameters.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStoreParameters__
-#define __java_security_cert_CertStoreParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertStoreParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStoreParameters : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertStoreParameters__
diff --git a/libjava/java/security/cert/CertStoreSpi.h b/libjava/java/security/cert/CertStoreSpi.h
deleted file mode 100644
index 30dc3a4dbf2..00000000000
--- a/libjava/java/security/cert/CertStoreSpi.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStoreSpi__
-#define __java_security_cert_CertStoreSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRLSelector;
-          class CertSelector;
-          class CertStoreParameters;
-          class CertStoreSpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStoreSpi : public ::java::lang::Object
-{
-
-public:
-  CertStoreSpi(::java::security::cert::CertStoreParameters *);
-  virtual ::java::util::Collection * engineGetCertificates(::java::security::cert::CertSelector *) = 0;
-  virtual ::java::util::Collection * engineGetCRLs(::java::security::cert::CRLSelector *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertStoreSpi__
diff --git a/libjava/java/security/cert/Certificate$CertificateRep.h b/libjava/java/security/cert/Certificate$CertificateRep.h
deleted file mode 100644
index 3eb75f2cb12..00000000000
--- a/libjava/java/security/cert/Certificate$CertificateRep.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_Certificate$CertificateRep__
-#define __java_security_cert_Certificate$CertificateRep__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate$CertificateRep;
-      }
-    }
-  }
-}
-
-class java::security::cert::Certificate$CertificateRep : public ::java::lang::Object
-{
-
-public: // actually protected
-  Certificate$CertificateRep(::java::lang::String *, JArray< jbyte > *);
-  virtual ::java::lang::Object * readResolve();
-private:
-  static const jlong serialVersionUID = -8563758940495660020LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_Certificate$CertificateRep__
diff --git a/libjava/java/security/cert/Certificate.h b/libjava/java/security/cert/Certificate.h
deleted file mode 100644
index 350d78a9cf3..00000000000
--- a/libjava/java/security/cert/Certificate.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_Certificate__
-#define __java_security_cert_Certificate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::Certificate : public ::java::lang::Object
-{
-
-public: // actually protected
-  Certificate(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual void verify(::java::security::PublicKey *) = 0;
-  virtual void verify(::java::security::PublicKey *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::security::PublicKey * getPublicKey() = 0;
-public: // actually protected
-  virtual ::java::lang::Object * writeReplace();
-private:
-  static const jlong serialVersionUID = -3585440601605666277LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_Certificate__
diff --git a/libjava/java/security/cert/CertificateEncodingException.h b/libjava/java/security/cert/CertificateEncodingException.h
deleted file mode 100644
index f97e40e163f..00000000000
--- a/libjava/java/security/cert/CertificateEncodingException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateEncodingException__
-#define __java_security_cert_CertificateEncodingException__
-
-#pragma interface
-
-#include <java/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateEncodingException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateEncodingException : public ::java::security::cert::CertificateException
-{
-
-public:
-  CertificateEncodingException();
-  CertificateEncodingException(::java::lang::String *);
-  CertificateEncodingException(::java::lang::String *, ::java::lang::Throwable *);
-  CertificateEncodingException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 6219492851589449162LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateEncodingException__
diff --git a/libjava/java/security/cert/CertificateException.h b/libjava/java/security/cert/CertificateException.h
deleted file mode 100644
index 11658e28953..00000000000
--- a/libjava/java/security/cert/CertificateException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateException__
-#define __java_security_cert_CertificateException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CertificateException();
-  CertificateException(::java::lang::String *);
-  CertificateException(::java::lang::String *, ::java::lang::Throwable *);
-  CertificateException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 3192535253797119798LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateException__
diff --git a/libjava/java/security/cert/CertificateExpiredException.h b/libjava/java/security/cert/CertificateExpiredException.h
deleted file mode 100644
index a92013dc72f..00000000000
--- a/libjava/java/security/cert/CertificateExpiredException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateExpiredException__
-#define __java_security_cert_CertificateExpiredException__
-
-#pragma interface
-
-#include <java/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateExpiredException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateExpiredException : public ::java::security::cert::CertificateException
-{
-
-public:
-  CertificateExpiredException();
-  CertificateExpiredException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 9071001339691533771LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateExpiredException__
diff --git a/libjava/java/security/cert/CertificateFactory.h b/libjava/java/security/cert/CertificateFactory.h
deleted file mode 100644
index 184e3e4e971..00000000000
--- a/libjava/java/security/cert/CertificateFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateFactory__
-#define __java_security_cert_CertificateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace cert
-      {
-          class CRL;
-          class CertPath;
-          class Certificate;
-          class CertificateFactory;
-          class CertificateFactorySpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertificateFactory(::java::security::cert::CertificateFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::security::cert::CertificateFactory * getInstance(::java::lang::String *);
-  static ::java::security::cert::CertificateFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::cert::CertificateFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::lang::String * getType();
-  virtual ::java::security::cert::Certificate * generateCertificate(::java::io::InputStream *);
-  virtual ::java::util::Collection * generateCertificates(::java::io::InputStream *);
-  virtual ::java::security::cert::CRL * generateCRL(::java::io::InputStream *);
-  virtual ::java::util::Collection * generateCRLs(::java::io::InputStream *);
-  virtual ::java::security::cert::CertPath * generateCertPath(::java::io::InputStream *);
-  virtual ::java::security::cert::CertPath * generateCertPath(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::java::security::cert::CertPath * generateCertPath(::java::util::List *);
-  virtual ::java::util::Iterator * getCertPathEncodings();
-private:
-  static ::java::lang::String * CERTIFICATE_FACTORY;
-  ::java::security::cert::CertificateFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) certFacSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateFactory__
diff --git a/libjava/java/security/cert/CertificateFactorySpi.h b/libjava/java/security/cert/CertificateFactorySpi.h
deleted file mode 100644
index 2370e67940c..00000000000
--- a/libjava/java/security/cert/CertificateFactorySpi.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateFactorySpi__
-#define __java_security_cert_CertificateFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class CertPath;
-          class Certificate;
-          class CertificateFactorySpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateFactorySpi : public ::java::lang::Object
-{
-
-public:
-  CertificateFactorySpi();
-  virtual ::java::security::cert::Certificate * engineGenerateCertificate(::java::io::InputStream *) = 0;
-  virtual ::java::util::Collection * engineGenerateCertificates(::java::io::InputStream *) = 0;
-  virtual ::java::security::cert::CRL * engineGenerateCRL(::java::io::InputStream *) = 0;
-  virtual ::java::util::Collection * engineGenerateCRLs(::java::io::InputStream *) = 0;
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::io::InputStream *);
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::util::List *);
-  virtual ::java::util::Iterator * engineGetCertPathEncodings();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateFactorySpi__
diff --git a/libjava/java/security/cert/CertificateNotYetValidException.h b/libjava/java/security/cert/CertificateNotYetValidException.h
deleted file mode 100644
index 510bb39fe7a..00000000000
--- a/libjava/java/security/cert/CertificateNotYetValidException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateNotYetValidException__
-#define __java_security_cert_CertificateNotYetValidException__
-
-#pragma interface
-
-#include <java/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateNotYetValidException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateNotYetValidException : public ::java::security::cert::CertificateException
-{
-
-public:
-  CertificateNotYetValidException();
-  CertificateNotYetValidException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4355919900041064702LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateNotYetValidException__
diff --git a/libjava/java/security/cert/CertificateParsingException.h b/libjava/java/security/cert/CertificateParsingException.h
deleted file mode 100644
index 2827e896117..00000000000
--- a/libjava/java/security/cert/CertificateParsingException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateParsingException__
-#define __java_security_cert_CertificateParsingException__
-
-#pragma interface
-
-#include <java/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateParsingException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateParsingException : public ::java::security::cert::CertificateException
-{
-
-public:
-  CertificateParsingException();
-  CertificateParsingException(::java::lang::String *);
-  CertificateParsingException(::java::lang::String *, ::java::lang::Throwable *);
-  CertificateParsingException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -7989222416793322029LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateParsingException__
diff --git a/libjava/java/security/cert/CollectionCertStoreParameters.h b/libjava/java/security/cert/CollectionCertStoreParameters.h
deleted file mode 100644
index cabf8dfa337..00000000000
--- a/libjava/java/security/cert/CollectionCertStoreParameters.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CollectionCertStoreParameters__
-#define __java_security_cert_CollectionCertStoreParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CollectionCertStoreParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CollectionCertStoreParameters : public ::java::lang::Object
-{
-
-public:
-  CollectionCertStoreParameters();
-  CollectionCertStoreParameters(::java::util::Collection *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Collection * getCollection();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::Collection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) collection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CollectionCertStoreParameters__
diff --git a/libjava/java/security/cert/LDAPCertStoreParameters.h b/libjava/java/security/cert/LDAPCertStoreParameters.h
deleted file mode 100644
index 2cdde192f8e..00000000000
--- a/libjava/java/security/cert/LDAPCertStoreParameters.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_LDAPCertStoreParameters__
-#define __java_security_cert_LDAPCertStoreParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class LDAPCertStoreParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::LDAPCertStoreParameters : public ::java::lang::Object
-{
-
-public:
-  LDAPCertStoreParameters();
-  LDAPCertStoreParameters(::java::lang::String *);
-  LDAPCertStoreParameters(::java::lang::String *, jint);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * getServerName();
-  virtual jint getPort();
-  virtual ::java::lang::String * toString();
-private:
-  static const jint LDAP_PORT = 389;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) serverName;
-  jint port;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_LDAPCertStoreParameters__
diff --git a/libjava/java/security/cert/PKIXBuilderParameters.h b/libjava/java/security/cert/PKIXBuilderParameters.h
deleted file mode 100644
index bb9ffd70774..00000000000
--- a/libjava/java/security/cert/PKIXBuilderParameters.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXBuilderParameters__
-#define __java_security_cert_PKIXBuilderParameters__
-
-#pragma interface
-
-#include <java/security/cert/PKIXParameters.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-      namespace cert
-      {
-          class CertSelector;
-          class PKIXBuilderParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXBuilderParameters : public ::java::security::cert::PKIXParameters
-{
-
-public:
-  PKIXBuilderParameters(::java::security::KeyStore *, ::java::security::cert::CertSelector *);
-  PKIXBuilderParameters(::java::util::Set *, ::java::security::cert::CertSelector *);
-  virtual jint getMaxPathLength();
-  virtual void setMaxPathLength(jint);
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::security::cert::PKIXParameters)))) maxPathLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXBuilderParameters__
diff --git a/libjava/java/security/cert/PKIXCertPathBuilderResult.h b/libjava/java/security/cert/PKIXCertPathBuilderResult.h
deleted file mode 100644
index ad6ee690b6b..00000000000
--- a/libjava/java/security/cert/PKIXCertPathBuilderResult.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXCertPathBuilderResult__
-#define __java_security_cert_PKIXCertPathBuilderResult__
-
-#pragma interface
-
-#include <java/security/cert/PKIXCertPathValidatorResult.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class CertPath;
-          class PKIXCertPathBuilderResult;
-          class PolicyNode;
-          class TrustAnchor;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXCertPathBuilderResult : public ::java::security::cert::PKIXCertPathValidatorResult
-{
-
-public:
-  PKIXCertPathBuilderResult(::java::security::cert::CertPath *, ::java::security::cert::TrustAnchor *, ::java::security::cert::PolicyNode *, ::java::security::PublicKey *);
-  virtual ::java::security::cert::CertPath * getCertPath();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::security::cert::CertPath * __attribute__((aligned(__alignof__( ::java::security::cert::PKIXCertPathValidatorResult)))) certPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXCertPathBuilderResult__
diff --git a/libjava/java/security/cert/PKIXCertPathChecker.h b/libjava/java/security/cert/PKIXCertPathChecker.h
deleted file mode 100644
index 375e8f33cbe..00000000000
--- a/libjava/java/security/cert/PKIXCertPathChecker.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXCertPathChecker__
-#define __java_security_cert_PKIXCertPathChecker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-          class PKIXCertPathChecker;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXCertPathChecker : public ::java::lang::Object
-{
-
-public: // actually protected
-  PKIXCertPathChecker();
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void init(jboolean) = 0;
-  virtual jboolean isForwardCheckingSupported() = 0;
-  virtual ::java::util::Set * getSupportedExtensions() = 0;
-  virtual void check(::java::security::cert::Certificate *, ::java::util::Collection *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXCertPathChecker__
diff --git a/libjava/java/security/cert/PKIXCertPathValidatorResult.h b/libjava/java/security/cert/PKIXCertPathValidatorResult.h
deleted file mode 100644
index 879bc2bf9dc..00000000000
--- a/libjava/java/security/cert/PKIXCertPathValidatorResult.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXCertPathValidatorResult__
-#define __java_security_cert_PKIXCertPathValidatorResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class PKIXCertPathValidatorResult;
-          class PolicyNode;
-          class TrustAnchor;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXCertPathValidatorResult : public ::java::lang::Object
-{
-
-public:
-  PKIXCertPathValidatorResult(::java::security::cert::TrustAnchor *, ::java::security::cert::PolicyNode *, ::java::security::PublicKey *);
-  virtual ::java::security::cert::TrustAnchor * getTrustAnchor();
-  virtual ::java::security::cert::PolicyNode * getPolicyTree();
-  virtual ::java::security::PublicKey * getPublicKey();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::security::cert::TrustAnchor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) trustAnchor;
-  ::java::security::cert::PolicyNode * policyTree;
-  ::java::security::PublicKey * subjectPublicKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXCertPathValidatorResult__
diff --git a/libjava/java/security/cert/PKIXParameters.h b/libjava/java/security/cert/PKIXParameters.h
deleted file mode 100644
index 7a953696c2b..00000000000
--- a/libjava/java/security/cert/PKIXParameters.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXParameters__
-#define __java_security_cert_PKIXParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-      namespace cert
-      {
-          class CertSelector;
-          class CertStore;
-          class PKIXCertPathChecker;
-          class PKIXParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXParameters : public ::java::lang::Object
-{
-
-public:
-  PKIXParameters(::java::security::KeyStore *);
-  PKIXParameters(::java::util::Set *);
-private:
-  PKIXParameters();
-  PKIXParameters(::java::security::cert::PKIXParameters *);
-public:
-  virtual ::java::util::Set * getTrustAnchors();
-  virtual void setTrustAnchors(::java::util::Set *);
-  virtual ::java::util::Set * getInitialPolicies();
-  virtual void setInitialPolicies(::java::util::Set *);
-  virtual void addCertStore(::java::security::cert::CertStore *);
-  virtual ::java::util::List * getCertStores();
-  virtual void setCertStores(::java::util::List *);
-  virtual jboolean isRevocationEnabled();
-  virtual void setRevocationEnabled(jboolean);
-  virtual jboolean isExplicitPolicyRequired();
-  virtual void setExplicitPolicyRequired(jboolean);
-  virtual jboolean isPolicyMappingInhibited();
-  virtual void setPolicyMappingInhibited(jboolean);
-  virtual jboolean isAnyPolicyInhibited();
-  virtual void setAnyPolicyInhibited(jboolean);
-  virtual jboolean getPolicyQualifiersRejected();
-  virtual void setPolicyQualifiersRejected(jboolean);
-  virtual ::java::util::Date * getDate();
-  virtual void setDate(::java::util::Date *);
-  virtual void addCertPathChecker(::java::security::cert::PKIXCertPathChecker *);
-  virtual ::java::util::List * getCertPathCheckers();
-  virtual void setCertPathCheckers(::java::util::List *);
-  virtual ::java::lang::String * getSigProvider();
-  virtual void setSigProvider(::java::lang::String *);
-  virtual ::java::security::cert::CertSelector * getTargetCertConstraints();
-  virtual void setTargetCertConstraints(::java::security::cert::CertSelector *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) trustAnchors;
-  ::java::util::Set * initPolicies;
-  ::java::util::List * certStores;
-  ::java::util::List * pathCheckers;
-  jboolean revocationEnabled;
-  jboolean exPolicyRequired;
-  jboolean policyMappingInhibited;
-  jboolean anyPolicyInhibited;
-  jboolean policyQualRejected;
-  ::java::util::Date * date;
-  ::java::lang::String * sigProvider;
-  ::java::security::cert::CertSelector * targetConstraints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXParameters__
diff --git a/libjava/java/security/cert/PolicyNode.h b/libjava/java/security/cert/PolicyNode.h
deleted file mode 100644
index 04cadaf0528..00000000000
--- a/libjava/java/security/cert/PolicyNode.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PolicyNode__
-#define __java_security_cert_PolicyNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class PolicyNode;
-      }
-    }
-  }
-}
-
-class java::security::cert::PolicyNode : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Iterator * getChildren() = 0;
-  virtual jint getDepth() = 0;
-  virtual ::java::util::Set * getExpectedPolicies() = 0;
-  virtual ::java::security::cert::PolicyNode * getParent() = 0;
-  virtual ::java::util::Set * getPolicyQualifiers() = 0;
-  virtual ::java::lang::String * getValidPolicy() = 0;
-  virtual jboolean isCritical() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_PolicyNode__
diff --git a/libjava/java/security/cert/PolicyQualifierInfo.h b/libjava/java/security/cert/PolicyQualifierInfo.h
deleted file mode 100644
index ed16d26f7cf..00000000000
--- a/libjava/java/security/cert/PolicyQualifierInfo.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PolicyQualifierInfo__
-#define __java_security_cert_PolicyQualifierInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace der
-        {
-            class DERValue;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class PolicyQualifierInfo;
-      }
-    }
-  }
-}
-
-class java::security::cert::PolicyQualifierInfo : public ::java::lang::Object
-{
-
-public:
-  PolicyQualifierInfo(JArray< jbyte > *);
-  virtual ::java::lang::String * getPolicyQualifierId();
-  virtual JArray< jbyte > * getEncoded();
-  virtual JArray< jbyte > * getPolicyQualifier();
-  virtual ::java::lang::String * toString();
-private:
-  ::gnu::java::security::OID * __attribute__((aligned(__alignof__( ::java::lang::Object)))) oid;
-  JArray< jbyte > * encoded;
-  ::gnu::java::security::der::DERValue * qualifier;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PolicyQualifierInfo__
diff --git a/libjava/java/security/cert/TrustAnchor.h b/libjava/java/security/cert/TrustAnchor.h
deleted file mode 100644
index 3afc671bc0b..00000000000
--- a/libjava/java/security/cert/TrustAnchor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_TrustAnchor__
-#define __java_security_cert_TrustAnchor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-            class X500DistinguishedName;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class TrustAnchor;
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::TrustAnchor : public ::java::lang::Object
-{
-
-public:
-  TrustAnchor(::java::security::cert::X509Certificate *, JArray< jbyte > *);
-  TrustAnchor(::java::lang::String *, ::java::security::PublicKey *, JArray< jbyte > *);
-  virtual ::java::security::cert::X509Certificate * getTrustedCert();
-  virtual ::java::lang::String * getCAName();
-  virtual ::java::security::PublicKey * getCAPublicKey();
-  virtual JArray< jbyte > * getNameConstraints();
-  virtual ::java::lang::String * toString();
-private:
-  ::gnu::java::security::x509::X500DistinguishedName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) caName;
-  ::java::security::PublicKey * caKey;
-  ::java::security::cert::X509Certificate * trustedCert;
-  JArray< jbyte > * nameConstraints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_TrustAnchor__
diff --git a/libjava/java/security/cert/X509CRL.h b/libjava/java/security/cert/X509CRL.h
deleted file mode 100644
index 1c92665020f..00000000000
--- a/libjava/java/security/cert/X509CRL.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509CRL__
-#define __java_security_cert_X509CRL__
-
-#pragma interface
-
-#include <java/security/cert/CRL.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-        class PublicKey;
-      namespace cert
-      {
-          class X509CRL;
-          class X509CRLEntry;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class java::security::cert::X509CRL : public ::java::security::cert::CRL
-{
-
-public: // actually protected
-  X509CRL();
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual void verify(::java::security::PublicKey *) = 0;
-  virtual void verify(::java::security::PublicKey *, ::java::lang::String *) = 0;
-  virtual jint getVersion() = 0;
-  virtual ::java::security::Principal * getIssuerDN() = 0;
-  virtual ::java::util::Date * getThisUpdate() = 0;
-  virtual ::java::util::Date * getNextUpdate() = 0;
-  virtual ::java::security::cert::X509CRLEntry * getRevokedCertificate(::java::math::BigInteger *) = 0;
-  virtual ::java::util::Set * getRevokedCertificates() = 0;
-  virtual JArray< jbyte > * getTBSCertList() = 0;
-  virtual JArray< jbyte > * getSignature() = 0;
-  virtual ::java::lang::String * getSigAlgName() = 0;
-  virtual ::java::lang::String * getSigAlgOID() = 0;
-  virtual JArray< jbyte > * getSigAlgParams() = 0;
-  virtual ::javax::security::auth::x500::X500Principal * getIssuerX500Principal();
-  virtual jboolean hasUnsupportedCriticalExtension() = 0;
-  virtual ::java::util::Set * getCriticalExtensionOIDs() = 0;
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs() = 0;
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_X509CRL__
diff --git a/libjava/java/security/cert/X509CRLEntry.h b/libjava/java/security/cert/X509CRLEntry.h
deleted file mode 100644
index 8d9c8d5f976..00000000000
--- a/libjava/java/security/cert/X509CRLEntry.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509CRLEntry__
-#define __java_security_cert_X509CRLEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class X509CRLEntry;
-      }
-    }
-  }
-}
-
-class java::security::cert::X509CRLEntry : public ::java::lang::Object
-{
-
-public:
-  X509CRLEntry();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getSerialNumber() = 0;
-  virtual ::java::util::Date * getRevocationDate() = 0;
-  virtual jboolean hasExtensions() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual jboolean hasUnsupportedCriticalExtension() = 0;
-  virtual ::java::util::Set * getCriticalExtensionOIDs() = 0;
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs() = 0;
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_X509CRLEntry__
diff --git a/libjava/java/security/cert/X509CRLSelector.h b/libjava/java/security/cert/X509CRLSelector.h
deleted file mode 100644
index e888f633e1a..00000000000
--- a/libjava/java/security/cert/X509CRLSelector.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509CRLSelector__
-#define __java_security_cert_X509CRLSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class X509CRLSelector;
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::X509CRLSelector : public ::java::lang::Object
-{
-
-public:
-  X509CRLSelector();
-  virtual void addIssuerName(JArray< jbyte > *);
-  virtual void addIssuerName(::java::lang::String *);
-  virtual void setIssuerNames(::java::util::Collection *);
-  virtual ::java::util::Collection * getIssuerNames();
-  virtual ::java::math::BigInteger * getMaxCRL();
-  virtual ::java::math::BigInteger * getMinCRL();
-  virtual void setMaxCRLNumber(::java::math::BigInteger *);
-  virtual void setMinCRLNumber(::java::math::BigInteger *);
-  virtual ::java::util::Date * getDateAndTime();
-  virtual void setDateAndTime(::java::util::Date *);
-  virtual ::java::security::cert::X509Certificate * getCertificateChecking();
-  virtual void setCertificateChecking(::java::security::cert::X509Certificate *);
-  virtual ::java::lang::String * toString();
-  virtual jboolean match(::java::security::cert::CRL *);
-  virtual ::java::lang::Object * clone();
-private:
-  static ::java::lang::String * CRL_NUMBER_ID;
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) issuerNames;
-  ::java::math::BigInteger * maxCrlNumber;
-  ::java::math::BigInteger * minCrlNumber;
-  ::java::util::Date * date;
-  ::java::security::cert::X509Certificate * cert;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_X509CRLSelector__
diff --git a/libjava/java/security/cert/X509CertSelector.h b/libjava/java/security/cert/X509CertSelector.h
deleted file mode 100644
index f1d5b3a8fbd..00000000000
--- a/libjava/java/security/cert/X509CertSelector.h
+++ /dev/null
@@ -1,151 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509CertSelector__
-#define __java_security_cert_X509CertSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace x509
-        {
-          namespace ext
-          {
-              class GeneralName;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class Certificate;
-          class X509CertSelector;
-          class X509Certificate;
-      }
-      namespace spec
-      {
-          class X509EncodedKeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class java::security::cert::X509CertSelector : public ::java::lang::Object
-{
-
-  static jboolean checkOid(JArray< jint > *);
-  static ::gnu::java::security::x509::ext::GeneralName * makeName(jint, ::java::lang::String *);
-public:
-  X509CertSelector();
-  virtual void addPathToName(jint, JArray< jbyte > *);
-  virtual void addPathToName(jint, ::java::lang::String *);
-  virtual void addSubjectAlternativeName(jint, JArray< jbyte > *);
-  virtual void addSubjectAlternativeName(jint, ::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< jbyte > * getAuthorityKeyIdentifier();
-  virtual jint getBasicConstraints();
-  virtual ::java::security::cert::X509Certificate * getCertificate();
-  virtual ::java::util::Date * getCertificateValid();
-  virtual ::java::util::Set * getExtendedKeyUsage();
-  virtual JArray< jbyte > * getIssuerAsBytes();
-  virtual ::java::lang::String * getIssuerAsString();
-  virtual JArray< jboolean > * getKeyUsage();
-  virtual jboolean getMatchAllSubjectAltNames();
-  virtual JArray< jbyte > * getNameConstraints();
-  virtual ::java::util::Collection * getPathToNames();
-  virtual ::java::util::Set * getPolicy();
-  virtual ::java::util::Date * getPrivateKeyValid();
-  virtual ::java::math::BigInteger * getSerialNumber();
-  virtual ::java::util::Collection * getSubjectAlternativeNames();
-  virtual JArray< jbyte > * getSubjectAsBytes();
-  virtual ::java::lang::String * getSubjectAsString();
-  virtual JArray< jbyte > * getSubjectKeyIdentifier();
-  virtual ::java::security::PublicKey * getSubjectPublicKey();
-  virtual ::java::lang::String * getSubjectPublicKeyAlgID();
-  virtual jboolean match(::java::security::cert::Certificate *);
-  virtual void setAuthorityKeyIdentifier(JArray< jbyte > *);
-  virtual void setBasicConstraints(jint);
-  virtual void setCertificate(::java::security::cert::X509Certificate *);
-  virtual void setCertificateValid(::java::util::Date *);
-  virtual void setExtendedKeyUsage(::java::util::Set *);
-  virtual void setIssuer(JArray< jbyte > *);
-  virtual void setIssuer(::java::lang::String *);
-  virtual void setKeyUsage(JArray< jboolean > *);
-  virtual void setMatchAllSubjectAltNames(jboolean);
-  virtual void setNameConstraints(JArray< jbyte > *);
-  virtual void setPathToNames(::java::util::Collection *);
-  virtual void setPolicy(::java::util::Set *);
-  virtual void setPrivateKeyValid(::java::util::Date *);
-  virtual void setSerialNumber(::java::math::BigInteger *);
-  virtual void setSubject(JArray< jbyte > *);
-  virtual void setSubject(::java::lang::String *);
-  virtual void setSubjectAlternativeNames(::java::util::Collection *);
-  virtual void setSubjectKeyIdentifier(JArray< jbyte > *);
-  virtual void setSubjectPublicKey(JArray< jbyte > *);
-  virtual void setSubjectPublicKey(::java::security::PublicKey *);
-  virtual void setSubjectPublicKeyAlgID(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind();
-private:
-  static ::java::lang::String * AUTH_KEY_ID;
-  static ::java::lang::String * SUBJECT_KEY_ID;
-  static ::java::lang::String * NAME_CONSTRAINTS_ID;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) basicConstraints;
-  ::java::security::cert::X509Certificate * cert;
-  ::java::math::BigInteger * serialNo;
-  ::javax::security::auth::x500::X500Principal * issuer;
-  ::javax::security::auth::x500::X500Principal * subject;
-  JArray< jbyte > * subjectKeyId;
-  JArray< jbyte > * authKeyId;
-  JArray< jboolean > * keyUsage;
-  ::java::util::Date * certValid;
-  ::gnu::java::security::OID * sigId;
-  ::java::security::PublicKey * subjectKey;
-  ::java::security::spec::X509EncodedKeySpec * subjectKeySpec;
-  ::java::util::Set * keyPurposeSet;
-  ::java::util::List * altNames;
-  jboolean matchAllNames;
-  JArray< jbyte > * nameConstraints;
-  ::java::util::Set * policy;
-  ::java::util::List * pathToNames;
-  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_X509CertSelector__
diff --git a/libjava/java/security/cert/X509Certificate.h b/libjava/java/security/cert/X509Certificate.h
deleted file mode 100644
index 9f8afe1f418..00000000000
--- a/libjava/java/security/cert/X509Certificate.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509Certificate__
-#define __java_security_cert_X509Certificate__
-
-#pragma interface
-
-#include <java/security/cert/Certificate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class java::security::cert::X509Certificate : public ::java::security::cert::Certificate
-{
-
-public: // actually protected
-  X509Certificate();
-public:
-  virtual void checkValidity() = 0;
-  virtual void checkValidity(::java::util::Date *) = 0;
-  virtual jint getVersion() = 0;
-  virtual ::java::math::BigInteger * getSerialNumber() = 0;
-  virtual ::java::security::Principal * getIssuerDN() = 0;
-  virtual ::java::security::Principal * getSubjectDN() = 0;
-  virtual ::java::util::Date * getNotBefore() = 0;
-  virtual ::java::util::Date * getNotAfter() = 0;
-  virtual JArray< jbyte > * getTBSCertificate() = 0;
-  virtual JArray< jbyte > * getSignature() = 0;
-  virtual ::java::lang::String * getSigAlgName() = 0;
-  virtual ::java::lang::String * getSigAlgOID() = 0;
-  virtual JArray< jbyte > * getSigAlgParams() = 0;
-  virtual JArray< jboolean > * getIssuerUniqueID() = 0;
-  virtual JArray< jboolean > * getSubjectUniqueID() = 0;
-  virtual JArray< jboolean > * getKeyUsage() = 0;
-  virtual jint getBasicConstraints() = 0;
-  virtual ::java::util::List * getExtendedKeyUsage();
-  virtual ::java::util::Collection * getSubjectAlternativeNames();
-  virtual ::java::util::Collection * getIssuerAlternativeNames();
-  virtual ::javax::security::auth::x500::X500Principal * getSubjectX500Principal();
-  virtual ::javax::security::auth::x500::X500Principal * getIssuerX500Principal();
-  virtual jboolean hasUnsupportedCriticalExtension() = 0;
-  virtual ::java::util::Set * getCriticalExtensionOIDs() = 0;
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs() = 0;
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *) = 0;
-private:
-  static const jlong serialVersionUID = -2491127588187038216LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_X509Certificate__
diff --git a/libjava/java/security/cert/X509Extension.h b/libjava/java/security/cert/X509Extension.h
deleted file mode 100644
index 53eb5d1b699..00000000000
--- a/libjava/java/security/cert/X509Extension.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509Extension__
-#define __java_security_cert_X509Extension__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Extension;
-      }
-    }
-  }
-}
-
-class java::security::cert::X509Extension : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean hasUnsupportedCriticalExtension() = 0;
-  virtual ::java::util::Set * getCriticalExtensionOIDs() = 0;
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs() = 0;
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_X509Extension__
diff --git a/libjava/java/security/interfaces/DSAKey.h b/libjava/java/security/interfaces/DSAKey.h
deleted file mode 100644
index ee58f377dc1..00000000000
--- a/libjava/java/security/interfaces/DSAKey.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAKey__
-#define __java_security_interfaces_DSAKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAKey;
-          class DSAParams;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::security::interfaces::DSAParams * getParams() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAKey__
diff --git a/libjava/java/security/interfaces/DSAKeyPairGenerator.h b/libjava/java/security/interfaces/DSAKeyPairGenerator.h
deleted file mode 100644
index 424348c80b6..00000000000
--- a/libjava/java/security/interfaces/DSAKeyPairGenerator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAKeyPairGenerator__
-#define __java_security_interfaces_DSAKeyPairGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace interfaces
-      {
-          class DSAKeyPairGenerator;
-          class DSAParams;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAKeyPairGenerator : public ::java::lang::Object
-{
-
-public:
-  virtual void initialize(::java::security::interfaces::DSAParams *, ::java::security::SecureRandom *) = 0;
-  virtual void initialize(jint, jboolean, ::java::security::SecureRandom *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAKeyPairGenerator__
diff --git a/libjava/java/security/interfaces/DSAParams.h b/libjava/java/security/interfaces/DSAParams.h
deleted file mode 100644
index e6963fb115d..00000000000
--- a/libjava/java/security/interfaces/DSAParams.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAParams__
-#define __java_security_interfaces_DSAParams__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAParams;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAParams : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getG() = 0;
-  virtual ::java::math::BigInteger * getP() = 0;
-  virtual ::java::math::BigInteger * getQ() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAParams__
diff --git a/libjava/java/security/interfaces/DSAPrivateKey.h b/libjava/java/security/interfaces/DSAPrivateKey.h
deleted file mode 100644
index e1fb8e86c6d..00000000000
--- a/libjava/java/security/interfaces/DSAPrivateKey.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAPrivateKey__
-#define __java_security_interfaces_DSAPrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAParams;
-          class DSAPrivateKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAPrivateKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getX() = 0;
-  virtual ::java::security::interfaces::DSAParams * getParams() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 7776497482533790279LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAPrivateKey__
diff --git a/libjava/java/security/interfaces/DSAPublicKey.h b/libjava/java/security/interfaces/DSAPublicKey.h
deleted file mode 100644
index 07916107483..00000000000
--- a/libjava/java/security/interfaces/DSAPublicKey.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAPublicKey__
-#define __java_security_interfaces_DSAPublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAParams;
-          class DSAPublicKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAPublicKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getY() = 0;
-  virtual ::java::security::interfaces::DSAParams * getParams() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 1234526332779022332LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAPublicKey__
diff --git a/libjava/java/security/interfaces/RSAKey.h b/libjava/java/security/interfaces/RSAKey.h
deleted file mode 100644
index 76985bdb64f..00000000000
--- a/libjava/java/security/interfaces/RSAKey.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAKey__
-#define __java_security_interfaces_RSAKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAKey__
diff --git a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.h b/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.h
deleted file mode 100644
index 3e4ff331fbc..00000000000
--- a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAMultiPrimePrivateCrtKey__
-#define __java_security_interfaces_RSAMultiPrimePrivateCrtKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAMultiPrimePrivateCrtKey;
-      }
-      namespace spec
-      {
-          class RSAOtherPrimeInfo;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAMultiPrimePrivateCrtKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getPublicExponent() = 0;
-  virtual ::java::math::BigInteger * getPrimeP() = 0;
-  virtual ::java::math::BigInteger * getPrimeQ() = 0;
-  virtual ::java::math::BigInteger * getPrimeExponentP() = 0;
-  virtual ::java::math::BigInteger * getPrimeExponentQ() = 0;
-  virtual ::java::math::BigInteger * getCrtCoefficient() = 0;
-  virtual JArray< ::java::security::spec::RSAOtherPrimeInfo * > * getOtherPrimeInfo() = 0;
-  virtual ::java::math::BigInteger * getPrivateExponent() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static const jlong serialVersionUID = 618058533534628008LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAMultiPrimePrivateCrtKey__
diff --git a/libjava/java/security/interfaces/RSAPrivateCrtKey.h b/libjava/java/security/interfaces/RSAPrivateCrtKey.h
deleted file mode 100644
index 7c6943d4342..00000000000
--- a/libjava/java/security/interfaces/RSAPrivateCrtKey.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAPrivateCrtKey__
-#define __java_security_interfaces_RSAPrivateCrtKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAPrivateCrtKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAPrivateCrtKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getPublicExponent() = 0;
-  virtual ::java::math::BigInteger * getPrimeP() = 0;
-  virtual ::java::math::BigInteger * getPrimeQ() = 0;
-  virtual ::java::math::BigInteger * getPrimeExponentP() = 0;
-  virtual ::java::math::BigInteger * getPrimeExponentQ() = 0;
-  virtual ::java::math::BigInteger * getCrtCoefficient() = 0;
-  virtual ::java::math::BigInteger * getPrivateExponent() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static const jlong serialVersionUID = -5682214253527700368LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAPrivateCrtKey__
diff --git a/libjava/java/security/interfaces/RSAPrivateKey.h b/libjava/java/security/interfaces/RSAPrivateKey.h
deleted file mode 100644
index b1e6139789c..00000000000
--- a/libjava/java/security/interfaces/RSAPrivateKey.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAPrivateKey__
-#define __java_security_interfaces_RSAPrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAPrivateKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAPrivateKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getPrivateExponent() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static const jlong serialVersionUID = 5187144804936595022LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAPrivateKey__
diff --git a/libjava/java/security/interfaces/RSAPublicKey.h b/libjava/java/security/interfaces/RSAPublicKey.h
deleted file mode 100644
index d2cd7e7031c..00000000000
--- a/libjava/java/security/interfaces/RSAPublicKey.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAPublicKey__
-#define __java_security_interfaces_RSAPublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAPublicKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAPublicKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getPublicExponent() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static const jlong serialVersionUID = -8727434096241101194LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAPublicKey__
diff --git a/libjava/java/security/natVMAccessControlState.cc b/libjava/java/security/natVMAccessControlState.cc
deleted file mode 100644
index a4c14cdd441..00000000000
--- a/libjava/java/security/natVMAccessControlState.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-// natVMAccessControlState.cc -- Native part of the VMAccessControlState class.
-
-/* Copyright (C) 2006 Free Software Foundation, Inc.
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-
-#include <java/lang/Thread.h>
-#include <java/security/VMAccessControlState.h>
-
-java::security::VMAccessControlState *
-java::security::VMAccessControlState::getThreadState ()
-{
-  java::lang::Thread *thread = java::lang::Thread::currentThread ();
-  if (thread == NULL)
-    return NULL;
-
-  VMAccessControlState *state =
-    reinterpret_cast<VMAccessControlState *> (thread->accessControlState);
-  if (state == NULL)
-    thread->accessControlState = state = new VMAccessControlState ();
-
-  return state;
-}
diff --git a/libjava/java/security/natVMAccessController.cc b/libjava/java/security/natVMAccessController.cc
deleted file mode 100644
index 9a0ae489e80..00000000000
--- a/libjava/java/security/natVMAccessController.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// natVMAccessController.cc -- Native part of the VMAccessController class.
-
-/* Copyright (C) 2006 Free Software Foundation, Inc.
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <java-stack.h>
-
-#include <java/security/VMAccessController.h>
-
-jobjectArray
-java::security::VMAccessController::getStack ()
-{
-  return _Jv_StackTrace::GetAccessControlStack ();
-}
diff --git a/libjava/java/security/spec/AlgorithmParameterSpec.h b/libjava/java/security/spec/AlgorithmParameterSpec.h
deleted file mode 100644
index 9fa07b0a3bc..00000000000
--- a/libjava/java/security/spec/AlgorithmParameterSpec.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_AlgorithmParameterSpec__
-#define __java_security_spec_AlgorithmParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::AlgorithmParameterSpec : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_spec_AlgorithmParameterSpec__
diff --git a/libjava/java/security/spec/DSAParameterSpec.h b/libjava/java/security/spec/DSAParameterSpec.h
deleted file mode 100644
index 83a2cb8ec01..00000000000
--- a/libjava/java/security/spec/DSAParameterSpec.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_DSAParameterSpec__
-#define __java_security_spec_DSAParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class DSAParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::DSAParameterSpec : public ::java::lang::Object
-{
-
-public:
-  DSAParameterSpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getQ();
-  virtual ::java::math::BigInteger * getG();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * g;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_DSAParameterSpec__
diff --git a/libjava/java/security/spec/DSAPrivateKeySpec.h b/libjava/java/security/spec/DSAPrivateKeySpec.h
deleted file mode 100644
index fe1cae312a4..00000000000
--- a/libjava/java/security/spec/DSAPrivateKeySpec.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_DSAPrivateKeySpec__
-#define __java_security_spec_DSAPrivateKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class DSAPrivateKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::DSAPrivateKeySpec : public ::java::lang::Object
-{
-
-public:
-  DSAPrivateKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getX();
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getQ();
-  virtual ::java::math::BigInteger * getG();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * g;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_DSAPrivateKeySpec__
diff --git a/libjava/java/security/spec/DSAPublicKeySpec.h b/libjava/java/security/spec/DSAPublicKeySpec.h
deleted file mode 100644
index aa0cc5c2ac5..00000000000
--- a/libjava/java/security/spec/DSAPublicKeySpec.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_DSAPublicKeySpec__
-#define __java_security_spec_DSAPublicKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class DSAPublicKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::DSAPublicKeySpec : public ::java::lang::Object
-{
-
-public:
-  DSAPublicKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getY();
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getQ();
-  virtual ::java::math::BigInteger * getG();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) y;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * g;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_DSAPublicKeySpec__
diff --git a/libjava/java/security/spec/EncodedKeySpec.h b/libjava/java/security/spec/EncodedKeySpec.h
deleted file mode 100644
index bc913b1e568..00000000000
--- a/libjava/java/security/spec/EncodedKeySpec.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_EncodedKeySpec__
-#define __java_security_spec_EncodedKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class EncodedKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::EncodedKeySpec : public ::java::lang::Object
-{
-
-public:
-  EncodedKeySpec(JArray< jbyte > *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat() = 0;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encodedKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_EncodedKeySpec__
diff --git a/libjava/java/security/spec/InvalidKeySpecException.h b/libjava/java/security/spec/InvalidKeySpecException.h
deleted file mode 100644
index ff2ea69fef3..00000000000
--- a/libjava/java/security/spec/InvalidKeySpecException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_InvalidKeySpecException__
-#define __java_security_spec_InvalidKeySpecException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class InvalidKeySpecException;
-      }
-    }
-  }
-}
-
-class java::security::spec::InvalidKeySpecException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  InvalidKeySpecException();
-  InvalidKeySpecException(::java::lang::String *);
-  InvalidKeySpecException(::java::lang::String *, ::java::lang::Throwable *);
-  InvalidKeySpecException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 3546139293998810778LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_InvalidKeySpecException__
diff --git a/libjava/java/security/spec/InvalidParameterSpecException.h b/libjava/java/security/spec/InvalidParameterSpecException.h
deleted file mode 100644
index e80550debc2..00000000000
--- a/libjava/java/security/spec/InvalidParameterSpecException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_InvalidParameterSpecException__
-#define __java_security_spec_InvalidParameterSpecException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class InvalidParameterSpecException;
-      }
-    }
-  }
-}
-
-class java::security::spec::InvalidParameterSpecException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  InvalidParameterSpecException();
-  InvalidParameterSpecException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -970468769593399342LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_InvalidParameterSpecException__
diff --git a/libjava/java/security/spec/KeySpec.h b/libjava/java/security/spec/KeySpec.h
deleted file mode 100644
index cdb7b40cfb4..00000000000
--- a/libjava/java/security/spec/KeySpec.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_KeySpec__
-#define __java_security_spec_KeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::KeySpec : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_spec_KeySpec__
diff --git a/libjava/java/security/spec/PKCS8EncodedKeySpec.h b/libjava/java/security/spec/PKCS8EncodedKeySpec.h
deleted file mode 100644
index 20e7007e139..00000000000
--- a/libjava/java/security/spec/PKCS8EncodedKeySpec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_PKCS8EncodedKeySpec__
-#define __java_security_spec_PKCS8EncodedKeySpec__
-
-#pragma interface
-
-#include <java/security/spec/EncodedKeySpec.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class PKCS8EncodedKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::PKCS8EncodedKeySpec : public ::java::security::spec::EncodedKeySpec
-{
-
-public:
-  PKCS8EncodedKeySpec(JArray< jbyte > *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_PKCS8EncodedKeySpec__
diff --git a/libjava/java/security/spec/PSSParameterSpec.h b/libjava/java/security/spec/PSSParameterSpec.h
deleted file mode 100644
index 01253a2ca05..00000000000
--- a/libjava/java/security/spec/PSSParameterSpec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_PSSParameterSpec__
-#define __java_security_spec_PSSParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class PSSParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::PSSParameterSpec : public ::java::lang::Object
-{
-
-public:
-  PSSParameterSpec(jint);
-  virtual jint getSaltLength();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) saltLen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_PSSParameterSpec__
diff --git a/libjava/java/security/spec/RSAKeyGenParameterSpec.h b/libjava/java/security/spec/RSAKeyGenParameterSpec.h
deleted file mode 100644
index a047dd668e6..00000000000
--- a/libjava/java/security/spec/RSAKeyGenParameterSpec.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAKeyGenParameterSpec__
-#define __java_security_spec_RSAKeyGenParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAKeyGenParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAKeyGenParameterSpec : public ::java::lang::Object
-{
-
-public:
-  RSAKeyGenParameterSpec(jint, ::java::math::BigInteger *);
-  virtual jint getKeysize();
-  virtual ::java::math::BigInteger * getPublicExponent();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) keysize;
-  ::java::math::BigInteger * publicExponent;
-public:
-  static ::java::math::BigInteger * F0;
-  static ::java::math::BigInteger * F4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAKeyGenParameterSpec__
diff --git a/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.h b/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.h
deleted file mode 100644
index bebb3d3a9e8..00000000000
--- a/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAMultiPrimePrivateCrtKeySpec__
-#define __java_security_spec_RSAMultiPrimePrivateCrtKeySpec__
-
-#pragma interface
-
-#include <java/security/spec/RSAPrivateKeySpec.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAMultiPrimePrivateCrtKeySpec;
-          class RSAOtherPrimeInfo;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAMultiPrimePrivateCrtKeySpec : public ::java::security::spec::RSAPrivateKeySpec
-{
-
-public:
-  RSAMultiPrimePrivateCrtKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, JArray< ::java::security::spec::RSAOtherPrimeInfo * > *);
-  virtual ::java::math::BigInteger * getPublicExponent();
-  virtual ::java::math::BigInteger * getPrimeP();
-  virtual ::java::math::BigInteger * getPrimeQ();
-  virtual ::java::math::BigInteger * getPrimeExponentP();
-  virtual ::java::math::BigInteger * getPrimeExponentQ();
-  virtual ::java::math::BigInteger * getCrtCoefficient();
-  virtual JArray< ::java::security::spec::RSAOtherPrimeInfo * > * getOtherPrimeInfo();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::security::spec::RSAPrivateKeySpec)))) publicExponent;
-  ::java::math::BigInteger * primeP;
-  ::java::math::BigInteger * primeQ;
-  ::java::math::BigInteger * primeExponentP;
-  ::java::math::BigInteger * primeExponentQ;
-  ::java::math::BigInteger * crtCoefficient;
-  JArray< ::java::security::spec::RSAOtherPrimeInfo * > * otherPrimeInfo;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAMultiPrimePrivateCrtKeySpec__
diff --git a/libjava/java/security/spec/RSAOtherPrimeInfo.h b/libjava/java/security/spec/RSAOtherPrimeInfo.h
deleted file mode 100644
index 878e3e58e04..00000000000
--- a/libjava/java/security/spec/RSAOtherPrimeInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAOtherPrimeInfo__
-#define __java_security_spec_RSAOtherPrimeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAOtherPrimeInfo;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAOtherPrimeInfo : public ::java::lang::Object
-{
-
-public:
-  RSAOtherPrimeInfo(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getPrime();
-  virtual ::java::math::BigInteger * getExponent();
-  virtual ::java::math::BigInteger * getCrtCoefficient();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prime;
-  ::java::math::BigInteger * primeExponent;
-  ::java::math::BigInteger * crtCoefficient;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAOtherPrimeInfo__
diff --git a/libjava/java/security/spec/RSAPrivateCrtKeySpec.h b/libjava/java/security/spec/RSAPrivateCrtKeySpec.h
deleted file mode 100644
index 4f25ac6789e..00000000000
--- a/libjava/java/security/spec/RSAPrivateCrtKeySpec.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAPrivateCrtKeySpec__
-#define __java_security_spec_RSAPrivateCrtKeySpec__
-
-#pragma interface
-
-#include <java/security/spec/RSAPrivateKeySpec.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAPrivateCrtKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAPrivateCrtKeySpec : public ::java::security::spec::RSAPrivateKeySpec
-{
-
-public:
-  RSAPrivateCrtKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getPublicExponent();
-  virtual ::java::math::BigInteger * getPrimeP();
-  virtual ::java::math::BigInteger * getPrimeQ();
-  virtual ::java::math::BigInteger * getPrimeExponentP();
-  virtual ::java::math::BigInteger * getPrimeExponentQ();
-  virtual ::java::math::BigInteger * getCrtCoefficient();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::security::spec::RSAPrivateKeySpec)))) publicExponent;
-  ::java::math::BigInteger * primeP;
-  ::java::math::BigInteger * primeQ;
-  ::java::math::BigInteger * primeExponentP;
-  ::java::math::BigInteger * primeExponentQ;
-  ::java::math::BigInteger * crtCoefficient;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAPrivateCrtKeySpec__
diff --git a/libjava/java/security/spec/RSAPrivateKeySpec.h b/libjava/java/security/spec/RSAPrivateKeySpec.h
deleted file mode 100644
index 4b0136b45f1..00000000000
--- a/libjava/java/security/spec/RSAPrivateKeySpec.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAPrivateKeySpec__
-#define __java_security_spec_RSAPrivateKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAPrivateKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAPrivateKeySpec : public ::java::lang::Object
-{
-
-public:
-  RSAPrivateKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getModulus();
-  virtual ::java::math::BigInteger * getPrivateExponent();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) modulus;
-  ::java::math::BigInteger * privateExponent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAPrivateKeySpec__
diff --git a/libjava/java/security/spec/RSAPublicKeySpec.h b/libjava/java/security/spec/RSAPublicKeySpec.h
deleted file mode 100644
index d6f80a3160c..00000000000
--- a/libjava/java/security/spec/RSAPublicKeySpec.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAPublicKeySpec__
-#define __java_security_spec_RSAPublicKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAPublicKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAPublicKeySpec : public ::java::lang::Object
-{
-
-public:
-  RSAPublicKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getModulus();
-  virtual ::java::math::BigInteger * getPublicExponent();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) modulus;
-  ::java::math::BigInteger * publicExponent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAPublicKeySpec__
diff --git a/libjava/java/security/spec/X509EncodedKeySpec.h b/libjava/java/security/spec/X509EncodedKeySpec.h
deleted file mode 100644
index 426ea1be7b7..00000000000
--- a/libjava/java/security/spec/X509EncodedKeySpec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_X509EncodedKeySpec__
-#define __java_security_spec_X509EncodedKeySpec__
-
-#pragma interface
-
-#include <java/security/spec/EncodedKeySpec.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class X509EncodedKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::X509EncodedKeySpec : public ::java::security::spec::EncodedKeySpec
-{
-
-public:
-  X509EncodedKeySpec(JArray< jbyte > *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_X509EncodedKeySpec__