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

31 files changed, 0 insertions, 1535 deletions

diff --git a/libjava/gnu/java/beans/encoder/ArrayPersistenceDelegate.h b/libjava/gnu/java/beans/encoder/ArrayPersistenceDelegate.h
deleted file mode 100644
index 489b404b051..00000000000
--- a/libjava/gnu/java/beans/encoder/ArrayPersistenceDelegate.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ArrayPersistenceDelegate__
-#define __gnu_java_beans_encoder_ArrayPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ArrayPersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ArrayPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  ArrayPersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-private:
-  static ::java::util::HashMap * NULL_VALUES;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ArrayPersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/ClassPersistenceDelegate.h b/libjava/gnu/java/beans/encoder/ClassPersistenceDelegate.h
deleted file mode 100644
index 4ca1df820cb..00000000000
--- a/libjava/gnu/java/beans/encoder/ClassPersistenceDelegate.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ClassPersistenceDelegate__
-#define __gnu_java_beans_encoder_ClassPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ClassPersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ClassPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  ClassPersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ClassPersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/CollectionPersistenceDelegate.h b/libjava/gnu/java/beans/encoder/CollectionPersistenceDelegate.h
deleted file mode 100644
index 99bd9dfb1c8..00000000000
--- a/libjava/gnu/java/beans/encoder/CollectionPersistenceDelegate.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_CollectionPersistenceDelegate__
-#define __gnu_java_beans_encoder_CollectionPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class CollectionPersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::CollectionPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  CollectionPersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_CollectionPersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/Context.h b/libjava/gnu/java/beans/encoder/Context.h
deleted file mode 100644
index 420376f3edf..00000000000
--- a/libjava/gnu/java/beans/encoder/Context.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_Context__
-#define __gnu_java_beans_encoder_Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Context;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::Context : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Context(::java::lang::String *, jint);
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) state;
-  jint call;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_Context__
diff --git a/libjava/gnu/java/beans/encoder/GenericScannerState.h b/libjava/gnu/java/beans/encoder/GenericScannerState.h
deleted file mode 100644
index 75e54adc407..00000000000
--- a/libjava/gnu/java/beans/encoder/GenericScannerState.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_GenericScannerState__
-#define __gnu_java_beans_encoder_GenericScannerState__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/ScannerState.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Context;
-            class GenericScannerState;
-            class ObjectId;
-            class Root;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::GenericScannerState : public ::gnu::java::beans::encoder::ScannerState
-{
-
-public: // actually package-private
-  GenericScannerState(::gnu::java::beans::encoder::Root *);
-  GenericScannerState(::gnu::java::beans::encoder::Root *, jint);
-public: // actually protected
-  virtual void enterImpl(::gnu::java::beans::encoder::Context *);
-public: // actually package-private
-  virtual void methodInvocation(::java::lang::String *);
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void classResolution(::java::lang::String *);
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void arraySet(::java::lang::String *);
-  virtual void arrayGet(::java::lang::String *);
-  virtual void listGet();
-  virtual void listSet();
-  virtual void nullObject();
-  virtual void stringReference(::java::lang::String *);
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *);
-  virtual void end();
-  virtual void enter();
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::ScannerState)))) skipElements;
-  jint initialSkipElements;
-public: // actually package-private
-  ::gnu::java::beans::encoder::Root * root;
-  ::java::util::HashMap * skipValues;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_GenericScannerState__
diff --git a/libjava/gnu/java/beans/encoder/IgnoringScannerState.h b/libjava/gnu/java/beans/encoder/IgnoringScannerState.h
deleted file mode 100644
index ef44b5c6a48..00000000000
--- a/libjava/gnu/java/beans/encoder/IgnoringScannerState.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_IgnoringScannerState__
-#define __gnu_java_beans_encoder_IgnoringScannerState__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/ScannerState.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class IgnoringScannerState;
-            class ObjectId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::IgnoringScannerState : public ::gnu::java::beans::encoder::ScannerState
-{
-
-public: // actually package-private
-  IgnoringScannerState();
-  virtual void methodInvocation(::java::lang::String *);
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void classResolution(::java::lang::String *);
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void arraySet(::java::lang::String *);
-  virtual void arrayGet(::java::lang::String *);
-  virtual void listGet();
-  virtual void listSet();
-  virtual void nullObject();
-  virtual void stringReference(::java::lang::String *);
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *);
-  virtual void end();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_IgnoringScannerState__
diff --git a/libjava/gnu/java/beans/encoder/MapPersistenceDelegate.h b/libjava/gnu/java/beans/encoder/MapPersistenceDelegate.h
deleted file mode 100644
index 0c99d67b6b1..00000000000
--- a/libjava/gnu/java/beans/encoder/MapPersistenceDelegate.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_MapPersistenceDelegate__
-#define __gnu_java_beans_encoder_MapPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class MapPersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::MapPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  MapPersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_MapPersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/ObjectId.h b/libjava/gnu/java/beans/encoder/ObjectId.h
deleted file mode 100644
index 7447c77ce7a..00000000000
--- a/libjava/gnu/java/beans/encoder/ObjectId.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ObjectId__
-#define __gnu_java_beans_encoder_ObjectId__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ObjectId : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ObjectId(::java::lang::Class *);
-public:
-  virtual jboolean isUnused();
-  virtual ::java::lang::String * toString();
-  virtual void init();
-private:
-  static ::java::util::HashMap * nameIndices;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::lang::Class * klass;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ObjectId__
diff --git a/libjava/gnu/java/beans/encoder/PrimitivePersistenceDelegate.h b/libjava/gnu/java/beans/encoder/PrimitivePersistenceDelegate.h
deleted file mode 100644
index 7102811bc8f..00000000000
--- a/libjava/gnu/java/beans/encoder/PrimitivePersistenceDelegate.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_PrimitivePersistenceDelegate__
-#define __gnu_java_beans_encoder_PrimitivePersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class PrimitivePersistenceDelegate;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::PrimitivePersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  PrimitivePersistenceDelegate();
-public: // actually protected
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_PrimitivePersistenceDelegate__
diff --git a/libjava/gnu/java/beans/encoder/ReportingScannerState.h b/libjava/gnu/java/beans/encoder/ReportingScannerState.h
deleted file mode 100644
index b613cedba59..00000000000
--- a/libjava/gnu/java/beans/encoder/ReportingScannerState.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ReportingScannerState__
-#define __gnu_java_beans_encoder_ReportingScannerState__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/ScannerState.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-            class ReportingScannerState;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ReportingScannerState : public ::gnu::java::beans::encoder::ScannerState
-{
-
-public: // actually package-private
-  ReportingScannerState();
-  virtual void methodInvocation(::java::lang::String *);
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void classResolution(::java::lang::String *);
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void arraySet(::java::lang::String *);
-  virtual void arrayGet(::java::lang::String *);
-  virtual void listGet();
-  virtual void listSet();
-  virtual void nullObject();
-  virtual void stringReference(::java::lang::String *);
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *);
-  virtual void end();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ReportingScannerState__
diff --git a/libjava/gnu/java/beans/encoder/Root$RootElement.h b/libjava/gnu/java/beans/encoder/Root$RootElement.h
deleted file mode 100644
index b25191fe1f6..00000000000
--- a/libjava/gnu/java/beans/encoder/Root$RootElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_Root$RootElement__
-#define __gnu_java_beans_encoder_Root$RootElement__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Root$RootElement;
-            class Writer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::Root$RootElement : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public: // actually package-private
-  Root$RootElement();
-public:
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_Root$RootElement__
diff --git a/libjava/gnu/java/beans/encoder/Root.h b/libjava/gnu/java/beans/encoder/Root.h
deleted file mode 100644
index 08f587b87ff..00000000000
--- a/libjava/gnu/java/beans/encoder/Root.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_Root__
-#define __gnu_java_beans_encoder_Root__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Root;
-            class Writer;
-          namespace elements
-          {
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::Root : public ::java::lang::Object
-{
-
-public:
-  Root();
-  virtual void addChild(::gnu::java::beans::encoder::elements::Element *);
-  virtual void end();
-  virtual void deleteLast();
-  virtual void traverse(::gnu::java::beans::encoder::Writer *);
-  virtual void close(::gnu::java::beans::encoder::Writer *);
-private:
-  void traverse(::gnu::java::beans::encoder::Writer *, ::java::util::Iterator *);
-  ::java::util::Stack * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parents;
-  ::gnu::java::beans::encoder::elements::Element * rootElement;
-  ::gnu::java::beans::encoder::elements::Element * current;
-  jboolean started;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_Root__
diff --git a/libjava/gnu/java/beans/encoder/ScanEngine.h b/libjava/gnu/java/beans/encoder/ScanEngine.h
deleted file mode 100644
index 7d5b52d3766..00000000000
--- a/libjava/gnu/java/beans/encoder/ScanEngine.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ScanEngine__
-#define __gnu_java_beans_encoder_ScanEngine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-            class Root;
-            class ScanEngine;
-            class ScannerState;
-            class Writer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Expression;
-        class Statement;
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ScanEngine : public ::java::lang::Object
-{
-
-public:
-  ScanEngine(::java::io::OutputStream *);
-private:
-  ::gnu::java::beans::encoder::ScannerState * register$(::java::lang::String *, ::gnu::java::beans::encoder::ScannerState *);
-  ::gnu::java::beans::encoder::ObjectId * retrieveId(::java::lang::Object *);
-public:
-  virtual void writeExpression(::java::beans::Expression *);
-  virtual void end();
-  virtual void revoke();
-  virtual void writeStatement(::java::beans::Statement *);
-  virtual jboolean writeObject(::java::lang::Object *);
-  virtual void flush();
-  virtual void close();
-private:
-  void transition(jint);
-public: // actually package-private
-  virtual void methodInvocation(::java::lang::String *);
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void classResolution(::java::lang::String *);
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *);
-  virtual void arraySet(::java::lang::String *);
-  virtual void arrayGet(::java::lang::String *);
-  virtual void listSet();
-  virtual void listGet();
-  virtual void nullObject();
-  virtual void stringReference(::java::lang::String *);
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) DEBUG;
-  ::java::util::HashMap * states;
-  ::java::util::Stack * parents;
-  ::gnu::java::beans::encoder::ScannerState * current;
-  ::gnu::java::beans::encoder::Root * root;
-  ::gnu::java::beans::encoder::Writer * writer;
-  ::java::util::IdentityHashMap * objects;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ScanEngine__
diff --git a/libjava/gnu/java/beans/encoder/ScannerState.h b/libjava/gnu/java/beans/encoder/ScannerState.h
deleted file mode 100644
index 77caf12325d..00000000000
--- a/libjava/gnu/java/beans/encoder/ScannerState.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_ScannerState__
-#define __gnu_java_beans_encoder_ScannerState__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Context;
-            class ObjectId;
-            class ScannerState;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::ScannerState : public ::java::lang::Object
-{
-
-public:
-  ScannerState();
-public: // actually package-private
-  virtual void init(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual void enter(::gnu::java::beans::encoder::Context *);
-public: // actually protected
-  virtual void enterImpl(::gnu::java::beans::encoder::Context *);
-public: // actually package-private
-  virtual ::gnu::java::beans::encoder::Context * context();
-  virtual jint getCalls();
-  virtual void putSuccessor(jint, ::java::lang::String *);
-  virtual ::java::lang::String * getSuccessor(jint);
-  virtual void setDefaultSuccessor(::java::lang::String *);
-  virtual void methodInvocation(::java::lang::String *) = 0;
-  virtual void staticMethodInvocation(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void staticFieldAccess(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void classResolution(::java::lang::String *) = 0;
-  virtual void objectInstantiation(::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *) = 0;
-  virtual void primitiveInstantiation(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void objectArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *) = 0;
-  virtual void primitiveArrayInstantiation(::java::lang::String *, ::java::lang::String *, ::gnu::java::beans::encoder::ObjectId *) = 0;
-  virtual void arraySet(::java::lang::String *) = 0;
-  virtual void arrayGet(::java::lang::String *) = 0;
-  virtual void listGet() = 0;
-  virtual void listSet() = 0;
-  virtual void nullObject() = 0;
-  virtual void stringReference(::java::lang::String *) = 0;
-  virtual void objectReference(::gnu::java::beans::encoder::ObjectId *) = 0;
-  virtual void end() = 0;
-  virtual void enter();
-  static const jint TRANSITION_METHOD_INVOCATION = 0;
-  static const jint TRANSITION_STATIC_METHOD_INVOCATION = 1;
-  static const jint TRANSITION_STATIC_FIELD_ACCESS = 2;
-  static const jint TRANSITION_CLASS_RESOLUTION = 3;
-  static const jint TRANSITION_OBJECT_INSTANTIATION = 4;
-  static const jint TRANSITION_PRIMITIVE_INSTANTIATION = 5;
-  static const jint TRANSITION_OBJECT_ARRAY_INSTANTIATION = 6;
-  static const jint TRANSITION_PRIMITIVE_ARRAY_INSTANTIATION = 7;
-  static const jint TRANSITION_ARRAY_SET = 8;
-  static const jint TRANSITION_ARRAY_GET = 9;
-  static const jint TRANSITION_LIST_SET = 10;
-  static const jint TRANSITION_LIST_GET = 11;
-  static const jint TRANSITION_NULL_OBJECT = 12;
-  static const jint TRANSITION_STRING_REFERENCE = 13;
-  static const jint TRANSITION_OBJECT_REFERENCE = 14;
-  static const jint TRANSITION_FIRST = 0;
-  static const jint TRANSITION_LAST = 14;
-  static ::java::lang::String * DEFAULT_STATE_NAME;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultSuccessor;
-  static JArray< ::java::lang::String * > * transitionNames;
-  ::java::util::HashMap * transitions;
-  jint calls;
-  ::gnu::java::beans::encoder::Context * context__;
-  ::java::lang::String * name;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_ScannerState__
diff --git a/libjava/gnu/java/beans/encoder/StAXWriter.h b/libjava/gnu/java/beans/encoder/StAXWriter.h
deleted file mode 100644
index 06298b0d779..00000000000
--- a/libjava/gnu/java/beans/encoder/StAXWriter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_StAXWriter__
-#define __gnu_java_beans_encoder_StAXWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class StAXWriter;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamWriter;
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::StAXWriter : public ::java::lang::Object
-{
-
-public:
-  StAXWriter(::java::io::OutputStream *);
-  virtual void flush();
-  virtual void close();
-  virtual void writePreamble();
-  virtual void writeEnd(jboolean);
-  virtual void writeEndNoChildren();
-  virtual void write(::java::lang::String *, jboolean);
-  virtual void write(::java::lang::String *, ::java::lang::String *);
-  virtual void writeNoChildren(::java::lang::String *, ::java::lang::String *);
-  virtual void write(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual void write(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean);
-  virtual void write(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean);
-public: // actually package-private
-  ::javax::xml::stream::XMLStreamWriter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
-  jint indent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_StAXWriter__
diff --git a/libjava/gnu/java/beans/encoder/Writer.h b/libjava/gnu/java/beans/encoder/Writer.h
deleted file mode 100644
index 21ac47d5876..00000000000
--- a/libjava/gnu/java/beans/encoder/Writer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_Writer__
-#define __gnu_java_beans_encoder_Writer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::Writer : public ::java::lang::Object
-{
-
-public:
-  virtual void writePreamble() = 0;
-  virtual void writeEnd(jboolean) = 0;
-  virtual void write(::java::lang::String *, jboolean) = 0;
-  virtual void write(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void write(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean) = 0;
-  virtual void write(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean) = 0;
-  virtual void write(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeNoChildren(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeEndNoChildren() = 0;
-  virtual void flush() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_beans_encoder_Writer__
diff --git a/libjava/gnu/java/beans/encoder/elements/ArrayInstantiation.h b/libjava/gnu/java/beans/encoder/elements/ArrayInstantiation.h
deleted file mode 100644
index aaf8ab1189b..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/ArrayInstantiation.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_ArrayInstantiation__
-#define __gnu_java_beans_encoder_elements_ArrayInstantiation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class ArrayInstantiation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::ArrayInstantiation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  ArrayInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-  ::java::lang::String * lengthAsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_ArrayInstantiation__
diff --git a/libjava/gnu/java/beans/encoder/elements/Array_Get.h b/libjava/gnu/java/beans/encoder/elements/Array_Get.h
deleted file mode 100644
index 73a0dd70256..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/Array_Get.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_Array_Get__
-#define __gnu_java_beans_encoder_elements_Array_Get__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class Array_Get;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::Array_Get : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  Array_Get(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) indexAsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_Array_Get__
diff --git a/libjava/gnu/java/beans/encoder/elements/Array_Set.h b/libjava/gnu/java/beans/encoder/elements/Array_Set.h
deleted file mode 100644
index 353d5a00dd8..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/Array_Set.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_Array_Set__
-#define __gnu_java_beans_encoder_elements_Array_Set__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class Array_Set;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::Array_Set : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  Array_Set(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) indexAsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_Array_Set__
diff --git a/libjava/gnu/java/beans/encoder/elements/ClassResolution.h b/libjava/gnu/java/beans/encoder/elements/ClassResolution.h
deleted file mode 100644
index 569602c5b1a..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/ClassResolution.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_ClassResolution__
-#define __gnu_java_beans_encoder_elements_ClassResolution__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class ClassResolution;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::ClassResolution : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  ClassResolution(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_ClassResolution__
diff --git a/libjava/gnu/java/beans/encoder/elements/Element.h b/libjava/gnu/java/beans/encoder/elements/Element.h
deleted file mode 100644
index 5c53e7d1ed9..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/Element.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_Element__
-#define __gnu_java_beans_encoder_elements_Element__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-            class Writer;
-          namespace elements
-          {
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::Element : public ::java::lang::Object
-{
-
-public:
-  Element();
-  virtual void initId(::gnu::java::beans::encoder::ObjectId *);
-  virtual void addChild(::gnu::java::beans::encoder::elements::Element *);
-  virtual void removeLast();
-  virtual ::java::util::Iterator * iterator();
-  virtual void clear();
-  virtual jboolean isEmpty();
-  virtual ::gnu::java::beans::encoder::ObjectId * getId();
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *) = 0;
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-private:
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
-  ::gnu::java::beans::encoder::ObjectId * objectId;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_Element__
diff --git a/libjava/gnu/java/beans/encoder/elements/List_Get.h b/libjava/gnu/java/beans/encoder/elements/List_Get.h
deleted file mode 100644
index cdd65d17631..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/List_Get.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_List_Get__
-#define __gnu_java_beans_encoder_elements_List_Get__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class List_Get;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::List_Get : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  List_Get();
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_List_Get__
diff --git a/libjava/gnu/java/beans/encoder/elements/List_Set.h b/libjava/gnu/java/beans/encoder/elements/List_Set.h
deleted file mode 100644
index 444fbac3611..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/List_Set.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_List_Set__
-#define __gnu_java_beans_encoder_elements_List_Set__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class List_Set;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::List_Set : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  List_Set();
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_List_Set__
diff --git a/libjava/gnu/java/beans/encoder/elements/MethodInvocation.h b/libjava/gnu/java/beans/encoder/elements/MethodInvocation.h
deleted file mode 100644
index 884d2c85752..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/MethodInvocation.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_MethodInvocation__
-#define __gnu_java_beans_encoder_elements_MethodInvocation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class MethodInvocation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::MethodInvocation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  MethodInvocation(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) methodName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_MethodInvocation__
diff --git a/libjava/gnu/java/beans/encoder/elements/NullObject.h b/libjava/gnu/java/beans/encoder/elements/NullObject.h
deleted file mode 100644
index 9c1dca7a2d0..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/NullObject.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_NullObject__
-#define __gnu_java_beans_encoder_elements_NullObject__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class NullObject;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::NullObject : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  NullObject();
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_NullObject__
diff --git a/libjava/gnu/java/beans/encoder/elements/ObjectInstantiation.h b/libjava/gnu/java/beans/encoder/elements/ObjectInstantiation.h
deleted file mode 100644
index 78881858822..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/ObjectInstantiation.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_ObjectInstantiation__
-#define __gnu_java_beans_encoder_elements_ObjectInstantiation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class ObjectInstantiation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::ObjectInstantiation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  ObjectInstantiation(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_ObjectInstantiation__
diff --git a/libjava/gnu/java/beans/encoder/elements/ObjectReference.h b/libjava/gnu/java/beans/encoder/elements/ObjectReference.h
deleted file mode 100644
index 9ee28a604f4..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/ObjectReference.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_ObjectReference__
-#define __gnu_java_beans_encoder_elements_ObjectReference__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ObjectId;
-            class Writer;
-          namespace elements
-          {
-              class ObjectReference;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::ObjectReference : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  ObjectReference(::gnu::java::beans::encoder::ObjectId *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::gnu::java::beans::encoder::ObjectId * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_ObjectReference__
diff --git a/libjava/gnu/java/beans/encoder/elements/PrimitiveInstantiation.h b/libjava/gnu/java/beans/encoder/elements/PrimitiveInstantiation.h
deleted file mode 100644
index 1a04f344ced..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/PrimitiveInstantiation.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_PrimitiveInstantiation__
-#define __gnu_java_beans_encoder_elements_PrimitiveInstantiation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class PrimitiveInstantiation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::PrimitiveInstantiation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  PrimitiveInstantiation(::java::lang::String *, ::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) primitiveName;
-  ::java::lang::String * valueAsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_PrimitiveInstantiation__
diff --git a/libjava/gnu/java/beans/encoder/elements/StaticFieldAccess.h b/libjava/gnu/java/beans/encoder/elements/StaticFieldAccess.h
deleted file mode 100644
index 0761cd8503b..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/StaticFieldAccess.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_StaticFieldAccess__
-#define __gnu_java_beans_encoder_elements_StaticFieldAccess__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class StaticFieldAccess;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::StaticFieldAccess : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  StaticFieldAccess(::java::lang::String *, ::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-  ::java::lang::String * fieldName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_StaticFieldAccess__
diff --git a/libjava/gnu/java/beans/encoder/elements/StaticMethodInvocation.h b/libjava/gnu/java/beans/encoder/elements/StaticMethodInvocation.h
deleted file mode 100644
index 982c7265439..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/StaticMethodInvocation.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_StaticMethodInvocation__
-#define __gnu_java_beans_encoder_elements_StaticMethodInvocation__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class StaticMethodInvocation;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::StaticMethodInvocation : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  StaticMethodInvocation(::java::lang::String *, ::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) className;
-  ::java::lang::String * methodName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_StaticMethodInvocation__
diff --git a/libjava/gnu/java/beans/encoder/elements/StringReference.h b/libjava/gnu/java/beans/encoder/elements/StringReference.h
deleted file mode 100644
index 01b10747022..00000000000
--- a/libjava/gnu/java/beans/encoder/elements/StringReference.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_beans_encoder_elements_StringReference__
-#define __gnu_java_beans_encoder_elements_StringReference__
-
-#pragma interface
-
-#include <gnu/java/beans/encoder/elements/Element.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class Writer;
-          namespace elements
-          {
-              class StringReference;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::beans::encoder::elements::StringReference : public ::gnu::java::beans::encoder::elements::Element
-{
-
-public:
-  StringReference(::java::lang::String *);
-  virtual void writeStart(::gnu::java::beans::encoder::Writer *);
-  virtual void writeEnd(::gnu::java::beans::encoder::Writer *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::beans::encoder::elements::Element)))) string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_beans_encoder_elements_StringReference__