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

70 files changed, 0 insertions, 3633 deletions

diff --git a/libjava/gnu/java/util/Base64.h b/libjava/gnu/java/util/Base64.h
deleted file mode 100644
index 69c2a4f..0000000
--- a/libjava/gnu/java/util/Base64.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_Base64__
-#define __gnu_java_util_Base64__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class Base64;
-      }
-    }
-  }
-}
-
-class gnu::java::util::Base64 : public ::java::lang::Object
-{
-
-  Base64();
-public:
-  static ::java::lang::String * encode(JArray< jbyte > *);
-  static ::java::lang::String * encode(JArray< jbyte > *, jint);
-  static ::java::lang::String * encode(JArray< jbyte > *, jint, jint, jint);
-  static JArray< jbyte > * decode(::java::lang::String *);
-private:
-  static ::java::lang::String * BASE_64;
-  static const jchar BASE_64_PAD = 61;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_Base64__
diff --git a/libjava/gnu/java/util/DoubleEnumeration.h b/libjava/gnu/java/util/DoubleEnumeration.h
deleted file mode 100644
index d1ec0ca..0000000
--- a/libjava/gnu/java/util/DoubleEnumeration.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_DoubleEnumeration__
-#define __gnu_java_util_DoubleEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class DoubleEnumeration;
-      }
-    }
-  }
-}
-
-class gnu::java::util::DoubleEnumeration : public ::java::lang::Object
-{
-
-public:
-  DoubleEnumeration(::java::util::Enumeration *, ::java::util::Enumeration *);
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) hasMore;
-  jboolean hasChecked;
-  ::java::util::Enumeration * e1;
-  ::java::util::Enumeration * e2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_DoubleEnumeration__
diff --git a/libjava/gnu/java/util/EmptyEnumeration.h b/libjava/gnu/java/util/EmptyEnumeration.h
deleted file mode 100644
index c565096..0000000
--- a/libjava/gnu/java/util/EmptyEnumeration.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_EmptyEnumeration__
-#define __gnu_java_util_EmptyEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class EmptyEnumeration;
-      }
-    }
-  }
-}
-
-class gnu::java::util::EmptyEnumeration : public ::java::lang::Object
-{
-
-public:
-  EmptyEnumeration();
-  static ::gnu::java::util::EmptyEnumeration * getInstance();
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-private:
-  static ::gnu::java::util::EmptyEnumeration * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_EmptyEnumeration__
diff --git a/libjava/gnu/java/util/LRUCache.h b/libjava/gnu/java/util/LRUCache.h
deleted file mode 100644
index fc524d0..0000000
--- a/libjava/gnu/java/util/LRUCache.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_LRUCache__
-#define __gnu_java_util_LRUCache__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class LRUCache;
-      }
-    }
-  }
-}
-
-class gnu::java::util::LRUCache : public ::java::util::LinkedHashMap
-{
-
-public:
-  LRUCache(jint);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::LinkedHashMap)))) capacity;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_LRUCache__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap$1.h b/libjava/gnu/java/util/WeakIdentityHashMap$1.h
deleted file mode 100644
index a25584d..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap$1__
-#define __gnu_java_util_WeakIdentityHashMap$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap$1;
-          class WeakIdentityHashMap$WeakBucket$WeakEntry;
-          class WeakIdentityHashMap$WeakEntrySet;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  WeakIdentityHashMap$1(::gnu::java::util::WeakIdentityHashMap$WeakEntrySet *);
-private:
-  void checkMod();
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * findNext(::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastEntry;
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * nextEntry;
-  jint knownMod;
-  ::gnu::java::util::WeakIdentityHashMap$WeakEntrySet * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap$1__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.h b/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.h
deleted file mode 100644
index 5a7c0dd..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap$WeakBucket$WeakEntry__
-#define __gnu_java_util_WeakIdentityHashMap$WeakBucket$WeakEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap$WeakBucket;
-          class WeakIdentityHashMap$WeakBucket$WeakEntry;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry : public ::java::lang::Object
-{
-
-public:
-  WeakIdentityHashMap$WeakBucket$WeakEntry(::gnu::java::util::WeakIdentityHashMap$WeakBucket *, ::java::lang::Object *);
-  virtual ::gnu::java::util::WeakIdentityHashMap$WeakBucket * getBucket();
-  virtual ::java::lang::Object * getKey();
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::Object * setValue(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap$WeakBucket$WeakEntry__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket.h b/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket.h
deleted file mode 100644
index ec84add..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap$WeakBucket.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap$WeakBucket__
-#define __gnu_java_util_WeakIdentityHashMap$WeakBucket__
-
-#pragma interface
-
-#include <java/lang/ref/WeakReference.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap$WeakBucket;
-          class WeakIdentityHashMap$WeakBucket$WeakEntry;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap$WeakBucket : public ::java::lang::ref::WeakReference
-{
-
-public:
-  WeakIdentityHashMap$WeakBucket(::java::lang::Object *, ::java::lang::ref::ReferenceQueue *, ::java::lang::Object *, jint);
-public: // actually package-private
-  virtual ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * getEntry();
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::ref::WeakReference)))) value;
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket * next;
-  jint slot;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap$WeakBucket__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.h b/libjava/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.h
deleted file mode 100644
index 136c1de..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap$WeakEntrySet__
-#define __gnu_java_util_WeakIdentityHashMap$WeakEntrySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap;
-          class WeakIdentityHashMap$WeakEntrySet;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap$WeakEntrySet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  WeakIdentityHashMap$WeakEntrySet(::gnu::java::util::WeakIdentityHashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static ::gnu::java::util::WeakIdentityHashMap * access$0(::gnu::java::util::WeakIdentityHashMap$WeakEntrySet *);
-  ::gnu::java::util::WeakIdentityHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap$WeakEntrySet__
diff --git a/libjava/gnu/java/util/WeakIdentityHashMap.h b/libjava/gnu/java/util/WeakIdentityHashMap.h
deleted file mode 100644
index 6bf3aeb7f..0000000
--- a/libjava/gnu/java/util/WeakIdentityHashMap.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_WeakIdentityHashMap__
-#define __gnu_java_util_WeakIdentityHashMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap;
-          class WeakIdentityHashMap$WeakBucket;
-          class WeakIdentityHashMap$WeakBucket$WeakEntry;
-          class WeakIdentityHashMap$WeakEntrySet;
-      }
-    }
-  }
-}
-
-class gnu::java::util::WeakIdentityHashMap : public ::java::util::AbstractMap
-{
-
-public:
-  WeakIdentityHashMap();
-  WeakIdentityHashMap(jint);
-  WeakIdentityHashMap(jint, jfloat);
-  WeakIdentityHashMap(::java::util::Map *);
-private:
-  jint hash(::java::lang::Object *);
-public: // actually package-private
-  virtual void cleanQueue();
-private:
-  void rehash();
-  ::gnu::java::util::WeakIdentityHashMap$WeakBucket$WeakEntry * internalGet(::java::lang::Object *);
-  void internalAdd(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  virtual void internalRemove(::gnu::java::util::WeakIdentityHashMap$WeakBucket *);
-public:
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual void clear();
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * keySet();
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::util::Collection * values();
-private:
-  static const jint DEFAULT_CAPACITY = 11;
-  static jfloat DEFAULT_LOAD_FACTOR;
-public: // actually package-private
-  static ::java::lang::Object * NULL_KEY;
-private:
-  ::java::lang::ref::ReferenceQueue * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) queue;
-public: // actually package-private
-  jint size__;
-private:
-  jfloat loadFactor;
-  jint threshold;
-public: // actually package-private
-  jint modCount;
-private:
-  ::gnu::java::util::WeakIdentityHashMap$WeakEntrySet * theEntrySet;
-public: // actually package-private
-  JArray< ::gnu::java::util::WeakIdentityHashMap$WeakBucket * > * buckets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_WeakIdentityHashMap__
diff --git a/libjava/gnu/java/util/ZoneInfo.h b/libjava/gnu/java/util/ZoneInfo.h
deleted file mode 100644
index 83a0bf8..0000000
--- a/libjava/gnu/java/util/ZoneInfo.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_ZoneInfo__
-#define __gnu_java_util_ZoneInfo__
-
-#pragma interface
-
-#include <java/util/TimeZone.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-          class ZoneInfo;
-      }
-    }
-  }
-}
-
-class gnu::java::util::ZoneInfo : public ::java::util::TimeZone
-{
-
-public:
-  ZoneInfo(jint, ::java::lang::String *, JArray< jlong > *, ::java::util::SimpleTimeZone *);
-  virtual jint getOffset(jint, jint, jint, jint, jint, jint);
-private:
-  jlong findTransition(jlong);
-public:
-  virtual jint getOffset(jlong);
-  virtual jint getRawOffset();
-  virtual void setRawOffset(jint);
-private:
-  void computeDSTSavings();
-public:
-  virtual jint getDSTSavings();
-  virtual jboolean useDaylightTime();
-  virtual jboolean inDaylightTime(::java::util::Date *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean hasSameRules(::java::util::TimeZone *);
-  virtual ::java::lang::String * toString();
-  static ::java::util::TimeZone * readTZFile(::java::lang::String *, ::java::lang::String *);
-private:
-  static void skipFully(::java::io::InputStream *, jlong);
-  static ::java::util::SimpleTimeZone * createLastRule(::java::lang::String *);
-  static JArray< jint > * getDateParams(::java::lang::String *);
-  static jint parseTime(::java::lang::String *);
-  static const jint SECS_SHIFT = 22;
-  static const jlong OFFSET_MASK = 2097151LL;
-  static const jint OFFSET_SHIFT = 43;
-  static const jlong IS_DST = 2097152LL;
-  jint __attribute__((aligned(__alignof__( ::java::util::TimeZone)))) rawOffset;
-  jint dstSavings;
-  jboolean useDaylight;
-  JArray< jlong > * transitions;
-  ::java::util::SimpleTimeZone * lastRule;
-  static ::java::util::SimpleTimeZone * gmtZone;
-public: // actually package-private
-  static const jlong serialVersionUID = -3740626706860383657LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_ZoneInfo__
diff --git a/libjava/gnu/java/util/jar/JarUtils.h b/libjava/gnu/java/util/jar/JarUtils.h
deleted file mode 100644
index 1d12845..0000000
--- a/libjava/gnu/java/util/jar/JarUtils.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_jar_JarUtils__
-#define __gnu_java_util_jar_JarUtils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace jar
-        {
-            class JarUtils;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::jar::JarUtils : public ::java::lang::Object
-{
-
-public:
-  JarUtils();
-  static void readMFManifest(::java::util::jar::Attributes *, ::java::util::Map *, ::java::io::InputStream *);
-  static void readSFManifest(::java::util::jar::Attributes *, ::java::util::Map *, ::java::io::InputStream *);
-private:
-  static void readMainSection(::java::util::jar::Attributes *, ::java::io::BufferedReader *);
-  static void readIndividualSections(::java::util::Map *, ::java::io::BufferedReader *);
-  static void readVersionInfo(::java::util::jar::Attributes *, ::java::io::BufferedReader *);
-  static ::java::lang::String * expectHeader(::java::lang::String *, ::java::io::BufferedReader *);
-  static void read_attributes(::java::util::jar::Attributes *, ::java::io::BufferedReader *);
-  static void readAttribute(::java::util::jar::Attributes *, ::java::lang::String *, ::java::io::BufferedReader *);
-  static ::java::lang::String * readHeaderValue(::java::lang::String *, ::java::io::BufferedReader *);
-  static ::java::util::jar::Attributes * readSectionName(::java::lang::String *, ::java::io::BufferedReader *, ::java::util::Map *);
-  static ::java::lang::String * expectHeader(::java::lang::String *, ::java::io::BufferedReader *, ::java::lang::String *);
-public:
-  static void writeMFManifest(::java::util::jar::Attributes *, ::java::util::Map *, ::java::io::OutputStream *);
-  static void writeSFManifest(::java::util::jar::Attributes *, ::java::util::Map *, ::java::io::OutputStream *);
-private:
-  static void writeVersionInfo(::java::util::jar::Attributes *, ::java::io::OutputStream *);
-  static void writeAttributeEntry(::java::util::Map$Entry *, ::java::io::OutputStream *);
-  static void writeHeader(::java::lang::String *, ::java::lang::String *, ::java::io::OutputStream *);
-public:
-  static ::java::lang::String * META_INF;
-  static ::java::lang::String * DSA_SUFFIX;
-  static ::java::lang::String * SF_SUFFIX;
-  static ::java::lang::String * NAME;
-  static ::java::lang::String * MANIFEST_VERSION;
-  static ::java::lang::String * SIGNATURE_VERSION;
-  static JArray< jbyte > * CRLF;
-private:
-  static ::java::lang::String * DEFAULT_MF_VERSION;
-  static ::java::lang::String * DEFAULT_SF_VERSION;
-  static ::java::util::jar::Attributes$Name * CREATED_BY;
-  static ::java::lang::String * CREATOR;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_jar_JarUtils__
diff --git a/libjava/gnu/java/util/prefs/FileBasedFactory.h b/libjava/gnu/java/util/prefs/FileBasedFactory.h
deleted file mode 100644
index 9dfcca3..0000000
--- a/libjava/gnu/java/util/prefs/FileBasedFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_FileBasedFactory__
-#define __gnu_java_util_prefs_FileBasedFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class FileBasedFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::FileBasedFactory : public ::java::lang::Object
-{
-
-public:
-  FileBasedFactory();
-  virtual ::java::util::prefs::Preferences * systemRoot();
-  virtual ::java::util::prefs::Preferences * userRoot();
-private:
-  static ::java::util::prefs::Preferences * systemPreferences;
-  static ::java::util::prefs::Preferences * userPreferences;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_FileBasedFactory__
diff --git a/libjava/gnu/java/util/prefs/FileBasedPreferences$1.h b/libjava/gnu/java/util/prefs/FileBasedPreferences$1.h
deleted file mode 100644
index 244914d..0000000
--- a/libjava/gnu/java/util/prefs/FileBasedPreferences$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_FileBasedPreferences$1__
-#define __gnu_java_util_prefs_FileBasedPreferences$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class FileBasedPreferences;
-            class FileBasedPreferences$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::FileBasedPreferences$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FileBasedPreferences$1(::gnu::java::util::prefs::FileBasedPreferences *);
-public:
-  virtual jboolean accept(::java::io::File *, ::java::lang::String *);
-public: // actually package-private
-  ::gnu::java::util::prefs::FileBasedPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_FileBasedPreferences$1__
diff --git a/libjava/gnu/java/util/prefs/FileBasedPreferences.h b/libjava/gnu/java/util/prefs/FileBasedPreferences.h
deleted file mode 100644
index 0b69998..0000000
--- a/libjava/gnu/java/util/prefs/FileBasedPreferences.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_FileBasedPreferences__
-#define __gnu_java_util_prefs_FileBasedPreferences__
-
-#pragma interface
-
-#include <java/util/prefs/AbstractPreferences.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class FileBasedPreferences;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::FileBasedPreferences : public ::java::util::prefs::AbstractPreferences
-{
-
-public: // actually package-private
-  FileBasedPreferences();
-  FileBasedPreferences(::gnu::java::util::prefs::FileBasedPreferences *, ::java::lang::String *);
-private:
-  void load();
-public:
-  virtual jboolean isUserNode();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * childrenNamesSpi();
-  virtual ::java::util::prefs::AbstractPreferences * childSpi(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * keysSpi();
-  virtual ::java::lang::String * getSpi(::java::lang::String *);
-  virtual void putSpi(::java::lang::String *, ::java::lang::String *);
-  virtual void removeSpi(::java::lang::String *);
-  virtual void flushSpi();
-  virtual void syncSpi();
-  virtual void removeNodeSpi();
-private:
-  static ::java::lang::String * DATA_FILE;
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::util::prefs::AbstractPreferences)))) directory;
-  ::java::io::File * dataFile;
-  ::java::util::Properties * properties;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_FileBasedPreferences__
diff --git a/libjava/gnu/java/util/prefs/GConfBasedFactory.h b/libjava/gnu/java/util/prefs/GConfBasedFactory.h
deleted file mode 100644
index eca98e3..0000000
--- a/libjava/gnu/java/util/prefs/GConfBasedFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_GConfBasedFactory__
-#define __gnu_java_util_prefs_GConfBasedFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class GConfBasedFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::GConfBasedFactory : public ::java::lang::Object
-{
-
-public:
-  GConfBasedFactory();
-  virtual ::java::util::prefs::Preferences * systemRoot();
-  virtual ::java::util::prefs::Preferences * userRoot();
-private:
-  static ::java::util::prefs::Preferences * systemPreferences;
-  static ::java::util::prefs::Preferences * userPreferences;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_GConfBasedFactory__
diff --git a/libjava/gnu/java/util/prefs/GConfBasedPreferences.h b/libjava/gnu/java/util/prefs/GConfBasedPreferences.h
deleted file mode 100644
index 54f9f01..0000000
--- a/libjava/gnu/java/util/prefs/GConfBasedPreferences.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_GConfBasedPreferences__
-#define __gnu_java_util_prefs_GConfBasedPreferences__
-
-#pragma interface
-
-#include <java/util/prefs/AbstractPreferences.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class GConfBasedPreferences;
-          namespace gconf
-          {
-              class GConfNativePeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-}
-
-class gnu::java::util::prefs::GConfBasedPreferences : public ::java::util::prefs::AbstractPreferences
-{
-
-public:
-  GConfBasedPreferences();
-  GConfBasedPreferences(jboolean);
-  GConfBasedPreferences(::java::util::prefs::AbstractPreferences *, ::java::lang::String *, jboolean);
-public: // actually protected
-  virtual ::java::util::prefs::AbstractPreferences * childSpi(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * childrenNamesSpi();
-public:
-  virtual void flush();
-public: // actually protected
-  virtual void flushSpi();
-  virtual JArray< ::java::lang::String * > * keysSpi();
-private:
-  void postorderRemove(::java::lang::String *);
-public: // actually protected
-  virtual void putSpi(::java::lang::String *, ::java::lang::String *);
-  virtual void removeNodeSpi();
-  virtual void removeSpi(::java::lang::String *);
-public:
-  virtual void sync();
-public: // actually protected
-  virtual void syncSpi();
-  virtual ::java::lang::String * getSpi(::java::lang::String *);
-public:
-  virtual jboolean isUserNode();
-private:
-  ::java::lang::String * getGConfKey(::java::lang::String *);
-  ::java::lang::String * getRealRoot(jboolean);
-  static ::java::security::Permission * PERMISSION;
-  static ::gnu::java::util::prefs::gconf::GConfNativePeer * backend;
-  static ::java::lang::String * DEFAULT_USER_ROOT;
-  static ::java::lang::String * DEFAULT_SYSTEM_ROOT;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::prefs::AbstractPreferences)))) node;
-  jboolean isUser;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_GConfBasedPreferences__
diff --git a/libjava/gnu/java/util/prefs/MemoryBasedFactory.h b/libjava/gnu/java/util/prefs/MemoryBasedFactory.h
deleted file mode 100644
index 7eb4c3d..0000000
--- a/libjava/gnu/java/util/prefs/MemoryBasedFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_MemoryBasedFactory__
-#define __gnu_java_util_prefs_MemoryBasedFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class MemoryBasedFactory;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::MemoryBasedFactory : public ::java::lang::Object
-{
-
-public:
-  MemoryBasedFactory();
-  virtual ::java::util::prefs::Preferences * systemRoot();
-  virtual ::java::util::prefs::Preferences * userRoot();
-private:
-  static ::java::util::prefs::Preferences * systemPreferences;
-  static ::java::util::prefs::Preferences * userPreferences;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_MemoryBasedFactory__
diff --git a/libjava/gnu/java/util/prefs/MemoryBasedPreferences.h b/libjava/gnu/java/util/prefs/MemoryBasedPreferences.h
deleted file mode 100644
index 5e73aa0..0000000
--- a/libjava/gnu/java/util/prefs/MemoryBasedPreferences.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_MemoryBasedPreferences__
-#define __gnu_java_util_prefs_MemoryBasedPreferences__
-
-#pragma interface
-
-#include <java/util/prefs/AbstractPreferences.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class MemoryBasedPreferences;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::MemoryBasedPreferences : public ::java::util::prefs::AbstractPreferences
-{
-
-public:
-  MemoryBasedPreferences(::gnu::java::util::prefs::MemoryBasedPreferences *, ::java::lang::String *, jboolean);
-  virtual jboolean isUserNode();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * childrenNamesSpi();
-  virtual ::java::util::prefs::AbstractPreferences * childSpi(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * keysSpi();
-  virtual ::java::lang::String * getSpi(::java::lang::String *);
-  virtual void putSpi(::java::lang::String *, ::java::lang::String *);
-  virtual void removeSpi(::java::lang::String *);
-  virtual void flushSpi();
-  virtual void syncSpi();
-  virtual void removeNodeSpi();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::util::prefs::AbstractPreferences)))) isUser;
-  ::java::util::HashMap * entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_MemoryBasedPreferences__
diff --git a/libjava/gnu/java/util/prefs/NodeReader.h b/libjava/gnu/java/util/prefs/NodeReader.h
deleted file mode 100644
index e62b023..0000000
--- a/libjava/gnu/java/util/prefs/NodeReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_NodeReader__
-#define __gnu_java_util_prefs_NodeReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class NodeReader;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::NodeReader : public ::java::lang::Object
-{
-
-public:
-  NodeReader(::java::io::Reader *, ::java::util::prefs::PreferencesFactory *);
-  NodeReader(::java::io::InputStream *, ::java::util::prefs::PreferencesFactory *);
-  virtual void importPreferences();
-private:
-  void readPreferences();
-  void readRoot();
-  void readNodes(::java::util::prefs::Preferences *);
-  void readMap(::java::util::prefs::Preferences *);
-  void readEntries(::java::util::prefs::Preferences *);
-  void skipTill(::java::lang::String *);
-  ::java::lang::String * readTill(::java::lang::String *);
-  ::java::lang::String * nextTag();
-  ::java::io::BufferedReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) br;
-  ::java::lang::String * line;
-  ::java::util::prefs::PreferencesFactory * factory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_NodeReader__
diff --git a/libjava/gnu/java/util/prefs/NodeWriter.h b/libjava/gnu/java/util/prefs/NodeWriter.h
deleted file mode 100644
index 65b7380..0000000
--- a/libjava/gnu/java/util/prefs/NodeWriter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_NodeWriter__
-#define __gnu_java_util_prefs_NodeWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class NodeWriter;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::NodeWriter : public ::java::lang::Object
-{
-
-public:
-  NodeWriter(::java::util::prefs::Preferences *, ::java::io::OutputStream *);
-  virtual void writePrefsTree();
-  virtual void writePrefs();
-private:
-  void writeHeader();
-  void writePreferences();
-  void writeRoot();
-  void writeRootMap();
-  jint writeParents();
-  void writeCloseParents(jint);
-  void writeNode();
-  void writeNode(::java::util::prefs::Preferences *, jint);
-  void writeMap(::java::util::prefs::Preferences *, jint);
-  void writeEntries(::java::util::prefs::Preferences *, ::java::lang::String *);
-  void indent(jint);
-  ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefs;
-  ::java::io::BufferedWriter * bw;
-  jboolean subtree;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_NodeWriter__
diff --git a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h b/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h
deleted file mode 100644
index e0e37d7..0000000
--- a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_gconf_GConfNativePeer__
-#define __gnu_java_util_prefs_gconf_GConfNativePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-          namespace gconf
-          {
-              class GConfNativePeer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::gconf::GConfNativePeer : public ::java::lang::Object
-{
-
-public:
-  GConfNativePeer();
-  jboolean nodeExist(::java::lang::String *);
-  jboolean setString(::java::lang::String *, ::java::lang::String *);
-  jboolean unset(::java::lang::String *);
-  ::java::lang::String * getKey(::java::lang::String *);
-  ::java::util::List * getKeys(::java::lang::String *);
-  ::java::util::List * getChildrenNodes(::java::lang::String *);
-  static ::java::lang::String * escapeString(::java::lang::String *);
-  static ::java::lang::String * unescapeString(::java::lang::String *);
-  void suggestSync();
-public: // actually protected
-  void finalize();
-private:
-  static void init_id_cache();
-  static void init_class();
-  static void finalize_class();
-public: // actually protected
-  static jboolean gconf_dir_exists(::java::lang::String *);
-  static jboolean gconf_set_string(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * gconf_get_string(::java::lang::String *);
-  static jboolean gconf_unset(::java::lang::String *);
-  static void gconf_suggest_sync();
-  static ::java::util::List * gconf_all_nodes(::java::lang::String *);
-  static ::java::util::List * gconf_all_keys(::java::lang::String *);
-  static ::java::lang::String * gconf_escape_key(::java::lang::String *);
-  static ::java::lang::String * gconf_unescape_key(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_gconf_GConfNativePeer__
diff --git a/libjava/gnu/java/util/regex/BacktrackStack$Backtrack.h b/libjava/gnu/java/util/regex/BacktrackStack$Backtrack.h
deleted file mode 100644
index 00d9e51..0000000
--- a/libjava/gnu/java/util/regex/BacktrackStack$Backtrack.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_BacktrackStack$Backtrack__
-#define __gnu_java_util_regex_BacktrackStack$Backtrack__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class BacktrackStack$Backtrack;
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::BacktrackStack$Backtrack : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BacktrackStack$Backtrack(::gnu::java::util::regex::REToken *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::java::lang::Object)))) token;
-  ::gnu::java::util::regex::CharIndexed * input;
-  ::gnu::java::util::regex::REMatch * match;
-  ::java::lang::Object * param;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_BacktrackStack$Backtrack__
diff --git a/libjava/gnu/java/util/regex/BacktrackStack.h b/libjava/gnu/java/util/regex/BacktrackStack.h
deleted file mode 100644
index 94ab3fd..0000000
--- a/libjava/gnu/java/util/regex/BacktrackStack.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_BacktrackStack__
-#define __gnu_java_util_regex_BacktrackStack__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class BacktrackStack;
-            class BacktrackStack$Backtrack;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::BacktrackStack : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BacktrackStack();
-  jboolean empty();
-  ::gnu::java::util::regex::BacktrackStack$Backtrack * peek();
-  ::gnu::java::util::regex::BacktrackStack$Backtrack * pop();
-  void clear();
-  void push(::gnu::java::util::regex::BacktrackStack$Backtrack *);
-  JArray< ::gnu::java::util::regex::BacktrackStack$Backtrack * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stack;
-private:
-  jint size;
-  jint capacity;
-  static const jint INITIAL_CAPACITY = 32;
-  static const jint CAPACITY_INCREMENT = 16;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_BacktrackStack__
diff --git a/libjava/gnu/java/util/regex/CharIndexed.h b/libjava/gnu/java/util/regex/CharIndexed.h
deleted file mode 100644
index 0f2687a..0000000
--- a/libjava/gnu/java/util/regex/CharIndexed.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexed__
-#define __gnu_java_util_regex_CharIndexed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexed : public ::java::lang::Object
-{
-
-public:
-  virtual jchar charAt(jint) = 0;
-  virtual jboolean move(jint) = 0;
-  virtual jboolean move1(jint) = 0;
-  virtual jboolean isValid() = 0;
-  virtual ::gnu::java::util::regex::CharIndexed * lookBehind(jint, jint) = 0;
-  virtual jint length() = 0;
-  virtual void setLastMatch(::gnu::java::util::regex::REMatch *) = 0;
-  virtual ::gnu::java::util::regex::REMatch * getLastMatch() = 0;
-  virtual void setHitEnd(::gnu::java::util::regex::REMatch *) = 0;
-  virtual jboolean hitEnd() = 0;
-  virtual jint getAnchor() = 0;
-  virtual void setAnchor(jint) = 0;
-  static const jchar OUT_OF_BOUNDS = 65535;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_util_regex_CharIndexed__
diff --git a/libjava/gnu/java/util/regex/CharIndexedCharArray.h b/libjava/gnu/java/util/regex/CharIndexedCharArray.h
deleted file mode 100644
index 30e97db..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedCharArray.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedCharArray__
-#define __gnu_java_util_regex_CharIndexedCharArray__
-
-#pragma interface
-
-#include <gnu/java/util/regex/CharIndexedCharSequence.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexedCharArray;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedCharArray : public ::gnu::java::util::regex::CharIndexedCharSequence
-{
-
-public: // actually package-private
-  CharIndexedCharArray(JArray< jchar > *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedCharArray__
diff --git a/libjava/gnu/java/util/regex/CharIndexedCharSequence.h b/libjava/gnu/java/util/regex/CharIndexedCharSequence.h
deleted file mode 100644
index f45b146..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedCharSequence.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedCharSequence__
-#define __gnu_java_util_regex_CharIndexedCharSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class CharIndexedCharSequence;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedCharSequence : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CharIndexedCharSequence(::java::lang::CharSequence *, jint);
-public:
-  virtual jchar charAt(jint);
-  virtual jboolean isValid();
-  virtual jboolean move(jint);
-  virtual jboolean move1(jint);
-  virtual ::gnu::java::util::regex::CharIndexed * lookBehind(jint, jint);
-  virtual jint length();
-  virtual void setLastMatch(::gnu::java::util::regex::REMatch *);
-  virtual ::gnu::java::util::regex::REMatch * getLastMatch();
-  virtual void setHitEnd(::gnu::java::util::regex::REMatch *);
-  virtual jboolean hitEnd();
-  virtual jint getAnchor();
-  virtual void setAnchor(jint);
-private:
-  ::java::lang::CharSequence * __attribute__((aligned(__alignof__( ::java::lang::Object)))) s;
-  jint anchor;
-  jint len;
-  ::gnu::java::util::regex::REMatch * lastMatch;
-  jint rightmostTriedPosition;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedCharSequence__
diff --git a/libjava/gnu/java/util/regex/CharIndexedInputStream.h b/libjava/gnu/java/util/regex/CharIndexedInputStream.h
deleted file mode 100644
index 46c8582..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedInputStream.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedInputStream__
-#define __gnu_java_util_regex_CharIndexedInputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class CharIndexedInputStream;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedInputStream : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CharIndexedInputStream(::java::io::InputStream *, jint);
-private:
-  jboolean next();
-public:
-  virtual jchar charAt(jint);
-  virtual jboolean move(jint);
-  virtual jboolean isValid();
-  virtual ::gnu::java::util::regex::CharIndexed * lookBehind(jint, jint);
-  virtual jint length();
-  virtual void setLastMatch(::gnu::java::util::regex::REMatch *);
-  virtual ::gnu::java::util::regex::REMatch * getLastMatch();
-  virtual void setHitEnd(::gnu::java::util::regex::REMatch *);
-  virtual jboolean hitEnd();
-  virtual jint getAnchor();
-  virtual void setAnchor(jint);
-  virtual jboolean move1(jint);
-private:
-  static const jint BUFFER_INCREMENT = 1024;
-  static const jint UNKNOWN = 2147483647;
-  ::java::io::BufferedInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) br;
-  jint index;
-  jint bufsize;
-  jint end;
-  jchar cached;
-  JArray< jchar > * lookBehind__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedInputStream__
diff --git a/libjava/gnu/java/util/regex/CharIndexedString.h b/libjava/gnu/java/util/regex/CharIndexedString.h
deleted file mode 100644
index e250a31..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedString.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedString__
-#define __gnu_java_util_regex_CharIndexedString__
-
-#pragma interface
-
-#include <gnu/java/util/regex/CharIndexedCharSequence.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexedString;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedString : public ::gnu::java::util::regex::CharIndexedCharSequence
-{
-
-public: // actually package-private
-  CharIndexedString(::java::lang::String *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedString__
diff --git a/libjava/gnu/java/util/regex/CharIndexedStringBuffer.h b/libjava/gnu/java/util/regex/CharIndexedStringBuffer.h
deleted file mode 100644
index 497422b..0000000
--- a/libjava/gnu/java/util/regex/CharIndexedStringBuffer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_CharIndexedStringBuffer__
-#define __gnu_java_util_regex_CharIndexedStringBuffer__
-
-#pragma interface
-
-#include <gnu/java/util/regex/CharIndexedCharSequence.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexedStringBuffer;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::CharIndexedStringBuffer : public ::gnu::java::util::regex::CharIndexedCharSequence
-{
-
-public: // actually package-private
-  CharIndexedStringBuffer(::java::lang::StringBuffer *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_CharIndexedStringBuffer__
diff --git a/libjava/gnu/java/util/regex/RE$CharExpression.h b/libjava/gnu/java/util/regex/RE$CharExpression.h
deleted file mode 100644
index d39ea7b..0000000
--- a/libjava/gnu/java/util/regex/RE$CharExpression.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$CharExpression__
-#define __gnu_java_util_regex_RE$CharExpression__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$CharExpression;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$CharExpression : public ::java::lang::Object
-{
-
-  RE$CharExpression();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  RE$CharExpression(::gnu::java::util::regex::RE$CharExpression *);
-  jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) ch;
-  ::java::lang::String * expr;
-  jint len;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$CharExpression__
diff --git a/libjava/gnu/java/util/regex/RE$CharUnit.h b/libjava/gnu/java/util/regex/RE$CharUnit.h
deleted file mode 100644
index 2ca3088..0000000
--- a/libjava/gnu/java/util/regex/RE$CharUnit.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$CharUnit__
-#define __gnu_java_util_regex_RE$CharUnit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$CharUnit;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$CharUnit : public ::java::lang::Object
-{
-
-  RE$CharUnit();
-public: // actually package-private
-  RE$CharUnit(::gnu::java::util::regex::RE$CharUnit *);
-public:
-  jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) ch;
-  jboolean bk;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$CharUnit__
diff --git a/libjava/gnu/java/util/regex/RE$IntPair.h b/libjava/gnu/java/util/regex/RE$IntPair.h
deleted file mode 100644
index 88019c2..0000000
--- a/libjava/gnu/java/util/regex/RE$IntPair.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$IntPair__
-#define __gnu_java_util_regex_RE$IntPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$IntPair;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$IntPair : public ::java::lang::Object
-{
-
-  RE$IntPair();
-public: // actually package-private
-  RE$IntPair(::gnu::java::util::regex::RE$IntPair *);
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) first;
-  jint second;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$IntPair__
diff --git a/libjava/gnu/java/util/regex/RE$NamedProperty.h b/libjava/gnu/java/util/regex/RE$NamedProperty.h
deleted file mode 100644
index a874f85..0000000
--- a/libjava/gnu/java/util/regex/RE$NamedProperty.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$NamedProperty__
-#define __gnu_java_util_regex_RE$NamedProperty__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$NamedProperty;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$NamedProperty : public ::java::lang::Object
-{
-
-  RE$NamedProperty();
-public: // actually package-private
-  RE$NamedProperty(::gnu::java::util::regex::RE$NamedProperty *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jboolean negate;
-  jint len;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$NamedProperty__
diff --git a/libjava/gnu/java/util/regex/RE$ParseCharClassResult.h b/libjava/gnu/java/util/regex/RE$ParseCharClassResult.h
deleted file mode 100644
index 5395877..0000000
--- a/libjava/gnu/java/util/regex/RE$ParseCharClassResult.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE$ParseCharClassResult__
-#define __gnu_java_util_regex_RE$ParseCharClassResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE$ParseCharClassResult;
-            class RETokenOneOf;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE$ParseCharClassResult : public ::java::lang::Object
-{
-
-  RE$ParseCharClassResult();
-public: // actually package-private
-  RE$ParseCharClassResult(::gnu::java::util::regex::RE$ParseCharClassResult *);
-  ::gnu::java::util::regex::RETokenOneOf * __attribute__((aligned(__alignof__( ::java::lang::Object)))) token;
-  jint index;
-  jboolean returnAtAndOperator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE$ParseCharClassResult__
diff --git a/libjava/gnu/java/util/regex/RE.h b/libjava/gnu/java/util/regex/RE.h
deleted file mode 100644
index ee798b7..0000000
--- a/libjava/gnu/java/util/regex/RE.h
+++ /dev/null
@@ -1,150 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RE__
-#define __gnu_java_util_regex_RE__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class RE;
-            class RE$CharExpression;
-            class RE$CharUnit;
-            class RE$IntPair;
-            class RE$NamedProperty;
-            class RE$ParseCharClassResult;
-            class REMatch;
-            class REMatchEnumeration;
-            class RESyntax;
-            class REToken;
-            class RETokenNamedProperty;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RE : public ::gnu::java::util::regex::REToken
-{
-
-public:
-  static ::java::lang::String * version();
-public: // actually package-private
-  static ::java::lang::String * getLocalizedMessage(::java::lang::String *);
-public:
-  RE(::java::lang::Object *);
-  RE(::java::lang::Object *, jint);
-  RE(::java::lang::Object *, jint, ::gnu::java::util::regex::RESyntax *);
-private:
-  RE(::gnu::java::util::regex::REToken *, ::gnu::java::util::regex::REToken *, jint, jint, jint, jint);
-  RE(::java::lang::Object *, jint, ::gnu::java::util::regex::RESyntax *, jint, jint);
-public: // actually protected
-  RE();
-  virtual void initialize(::java::lang::Object *, jint, ::gnu::java::util::regex::RESyntax *, jint, jint);
-private:
-  static ::gnu::java::util::regex::RE$ParseCharClassResult * parseCharClass(jint, JArray< jchar > *, jint, jint, jint, ::gnu::java::util::regex::RESyntax *, jint);
-  static jint getCharUnit(JArray< jchar > *, jint, ::gnu::java::util::regex::RE$CharUnit *, jboolean);
-  static jint parseInt(JArray< jchar > *, jint, jint, jint);
-  static ::gnu::java::util::regex::RE$CharExpression * getCharExpression(JArray< jchar > *, jint, jint, ::gnu::java::util::regex::RESyntax *);
-  static ::gnu::java::util::regex::RE$NamedProperty * getNamedProperty(JArray< jchar > *, jint, jint);
-  static ::gnu::java::util::regex::RETokenNamedProperty * getRETokenNamedProperty(jint, ::gnu::java::util::regex::RE$NamedProperty *, jboolean, jint);
-public:
-  virtual jboolean isMatch(::java::lang::Object *);
-  virtual jboolean isMatch(::java::lang::Object *, jint);
-  virtual jboolean isMatch(::java::lang::Object *, jint, jint);
-private:
-  jboolean isMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint);
-public:
-  virtual jint getNumSubs();
-public: // actually package-private
-  virtual void setUncle(::gnu::java::util::regex::REToken *);
-  virtual jboolean chain(::gnu::java::util::regex::REToken *);
-public:
-  virtual jint getMinimumLength();
-  virtual jint getMaximumLength();
-  virtual JArray< ::gnu::java::util::regex::REMatch * > * getAllMatches(::java::lang::Object *);
-  virtual JArray< ::gnu::java::util::regex::REMatch * > * getAllMatches(::java::lang::Object *, jint);
-  virtual JArray< ::gnu::java::util::regex::REMatch * > * getAllMatches(::java::lang::Object *, jint, jint);
-private:
-  JArray< ::gnu::java::util::regex::REMatch * > * getAllMatchesImpl(::gnu::java::util::regex::CharIndexed *, jint, jint);
-public: // actually package-private
-  virtual jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-public:
-  virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *);
-  virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint);
-  virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint);
-  virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint, ::gnu::java::lang::CPStringBuilder *);
-public: // actually package-private
-  virtual ::gnu::java::util::regex::REMatch * getMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint, ::gnu::java::lang::CPStringBuilder *);
-public:
-  virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *);
-  virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *, jint);
-  virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *, jint, jint);
-  virtual ::java::lang::String * substitute(::java::lang::Object *, ::java::lang::String *);
-  virtual ::java::lang::String * substitute(::java::lang::Object *, ::java::lang::String *, jint);
-  virtual ::java::lang::String * substitute(::java::lang::Object *, ::java::lang::String *, jint, jint);
-private:
-  ::java::lang::String * substituteImpl(::gnu::java::util::regex::CharIndexed *, ::java::lang::String *, jint, jint);
-public:
-  virtual ::java::lang::String * substituteAll(::java::lang::Object *, ::java::lang::String *);
-  virtual ::java::lang::String * substituteAll(::java::lang::Object *, ::java::lang::String *, jint);
-  virtual ::java::lang::String * substituteAll(::java::lang::Object *, ::java::lang::String *, jint, jint);
-private:
-  ::java::lang::String * substituteAllImpl(::gnu::java::util::regex::CharIndexed *, ::java::lang::String *, jint, jint);
-public:
-  static ::java::lang::String * getReplacement(::java::lang::String *, ::gnu::java::util::regex::REMatch *, jint);
-private:
-  void addToken(::gnu::java::util::regex::REToken *);
-  static ::gnu::java::util::regex::REToken * setRepeated(::gnu::java::util::regex::REToken *, jint, jint, jint);
-  static jint getPosixSet(JArray< jchar > *, jint, ::gnu::java::lang::CPStringBuilder *);
-  jint getMinMax(JArray< jchar > *, jint, ::gnu::java::util::regex::RE$IntPair *, ::gnu::java::util::regex::RESyntax *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual void dump(::gnu::java::lang::CPStringBuilder *);
-public:
-  static ::gnu::java::util::regex::CharIndexed * makeCharIndexed(::java::lang::Object *, jint);
-private:
-  static ::java::lang::String * VERSION;
-  static ::java::util::ResourceBundle * messages;
-  static ::java::lang::String * bundle;
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) firstToken;
-  ::gnu::java::util::regex::REToken * lastToken;
-  jint numSubs;
-  jint minimumLength;
-  jint maximumLength;
-public:
-  static const jint REG_ICASE = 2;
-  static const jint REG_DOT_NEWLINE = 4;
-  static const jint REG_MULTILINE = 8;
-  static const jint REG_NOTBOL = 16;
-  static const jint REG_NOTEOL = 32;
-  static const jint REG_ANCHORINDEX = 64;
-  static const jint REG_NO_INTERPOLATE = 128;
-  static const jint REG_TRY_ENTIRE_MATCH = 256;
-  static const jint REG_REPLACE_USE_BACKSLASHESCAPE = 512;
-  static const jint REG_X_COMMENTS = 1024;
-  static const jint REG_ICASE_USASCII = 2048;
-  static const jint REG_FIX_STARTING_POSITION = 4096;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RE__
diff --git a/libjava/gnu/java/util/regex/REException.h b/libjava/gnu/java/util/regex/REException.h
deleted file mode 100644
index dc91d47..0000000
--- a/libjava/gnu/java/util/regex/REException.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REException__
-#define __gnu_java_util_regex_REException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class REException;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REException : public ::java::lang::Exception
-{
-
-public: // actually package-private
-  REException(::java::lang::String *, jint, jint);
-  REException(::java::lang::String *, ::java::lang::Throwable *, jint, jint);
-public:
-  virtual jint getType();
-  virtual jint getPosition();
-  virtual ::java::lang::String * getMessage();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) type;
-  jint pos;
-public:
-  static const jint REG_BADRPT = 1;
-  static const jint REG_BADBR = 2;
-  static const jint REG_EBRACE = 3;
-  static const jint REG_EBRACK = 4;
-  static const jint REG_ERANGE = 5;
-  static const jint REG_ECTYPE = 6;
-  static const jint REG_EPAREN = 7;
-  static const jint REG_ESUBREG = 8;
-  static const jint REG_EEND = 9;
-  static const jint REG_ESCAPE = 10;
-  static const jint REG_BADPAT = 11;
-  static const jint REG_ESIZE = 12;
-  static const jint REG_ESPACE = 13;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REException__
diff --git a/libjava/gnu/java/util/regex/REFilterInputStream.h b/libjava/gnu/java/util/regex/REFilterInputStream.h
deleted file mode 100644
index 2bed265..0000000
--- a/libjava/gnu/java/util/regex/REFilterInputStream.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REFilterInputStream__
-#define __gnu_java_util_regex_REFilterInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexedInputStream;
-            class RE;
-            class REFilterInputStream;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REFilterInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  REFilterInputStream(::java::io::InputStream *, ::gnu::java::util::regex::RE *, ::java::lang::String *);
-  virtual jint read();
-  virtual jboolean markSupported();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-private:
-  ::gnu::java::util::regex::RE * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) expr;
-  ::java::lang::String * replace;
-  ::java::lang::String * buffer;
-  jint bufpos;
-  jint offset;
-  ::gnu::java::util::regex::CharIndexedInputStream * stream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REFilterInputStream__
diff --git a/libjava/gnu/java/util/regex/REMatch.h b/libjava/gnu/java/util/regex/REMatch.h
deleted file mode 100644
index 363bb74..0000000
--- a/libjava/gnu/java/util/regex/REMatch.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REMatch__
-#define __gnu_java_util_regex_REMatch__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class BacktrackStack;
-            class CharIndexed;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REMatch : public ::java::lang::Object
-{
-
-public:
-  ::java::lang::Object * clone();
-public: // actually package-private
-  void assignFrom(::gnu::java::util::regex::REMatch *);
-  REMatch(jint, jint, jint);
-  void finish(::gnu::java::util::regex::CharIndexed *);
-  void clear(jint);
-public:
-  ::java::lang::String * toString();
-  jint getStartIndex();
-  jint getEndIndex();
-  ::java::lang::String * toString(jint);
-  jint getSubStartIndex(jint);
-  jint getStartIndex(jint);
-  jint getSubEndIndex(jint);
-  jint getEndIndex(jint);
-  ::java::lang::String * substituteInto(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) matchedText;
-  ::gnu::java::util::regex::CharIndexed * matchedCharIndexed;
-public: // actually package-private
-  jint eflags;
-  jint offset;
-  jint anchor;
-  jint index;
-  JArray< jint > * start;
-  JArray< jint > * start1;
-  JArray< jint > * end;
-  jboolean empty;
-  ::gnu::java::util::regex::BacktrackStack * backtrackStack;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REMatch__
diff --git a/libjava/gnu/java/util/regex/REMatchEnumeration.h b/libjava/gnu/java/util/regex/REMatchEnumeration.h
deleted file mode 100644
index 6b0d888..0000000
--- a/libjava/gnu/java/util/regex/REMatchEnumeration.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REMatchEnumeration__
-#define __gnu_java_util_regex_REMatchEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class RE;
-            class REMatch;
-            class REMatchEnumeration;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REMatchEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  REMatchEnumeration(::gnu::java::util::regex::RE *, ::gnu::java::util::regex::CharIndexed *, jint, jint);
-public:
-  virtual jboolean hasMoreElements();
-  virtual jboolean hasMoreMatches();
-  virtual jboolean hasMoreMatches(::gnu::java::lang::CPStringBuilder *);
-  virtual ::gnu::java::util::regex::REMatch * REMatchEnumeration$nextElement();
-  virtual ::java::lang::Object * nextElement();
-private:
-  static const jint YES = 1;
-  static const jint MAYBE = 0;
-  static const jint NO = -1;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) more;
-  ::gnu::java::util::regex::REMatch * match;
-  ::gnu::java::util::regex::RE * expr;
-  ::gnu::java::util::regex::CharIndexed * input;
-  jint eflags;
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REMatchEnumeration__
diff --git a/libjava/gnu/java/util/regex/RESyntax.h b/libjava/gnu/java/util/regex/RESyntax.h
deleted file mode 100644
index 59c8de0..0000000
--- a/libjava/gnu/java/util/regex/RESyntax.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RESyntax__
-#define __gnu_java_util_regex_RESyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RESyntax;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RESyntax : public ::java::lang::Object
-{
-
-public:
-  RESyntax();
-  ::gnu::java::util::regex::RESyntax * makeFinal();
-  RESyntax(::gnu::java::util::regex::RESyntax *);
-  jboolean get(jint);
-  ::gnu::java::util::regex::RESyntax * set(jint);
-  ::gnu::java::util::regex::RESyntax * clear(jint);
-  ::gnu::java::util::regex::RESyntax * setLineSeparator(::java::lang::String *);
-  ::java::lang::String * getLineSeparator();
-public: // actually package-private
-  static ::java::lang::String * DEFAULT_LINE_SEPARATOR;
-private:
-  ::java::util::BitSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bits;
-  jboolean isFinal;
-  ::java::lang::String * lineSeparator;
-public:
-  static const jint RE_BACKSLASH_ESCAPE_IN_LISTS = 0;
-  static const jint RE_BK_PLUS_QM = 1;
-  static const jint RE_CHAR_CLASSES = 2;
-  static const jint RE_CONTEXT_INDEP_ANCHORS = 3;
-  static const jint RE_CONTEXT_INDEP_OPS = 4;
-  static const jint RE_CONTEXT_INVALID_OPS = 5;
-  static const jint RE_DOT_NEWLINE = 6;
-  static const jint RE_DOT_NOT_NULL = 7;
-  static const jint RE_INTERVALS = 8;
-  static const jint RE_LIMITED_OPS = 9;
-  static const jint RE_NEWLINE_ALT = 10;
-  static const jint RE_NO_BK_BRACES = 11;
-  static const jint RE_NO_BK_PARENS = 12;
-  static const jint RE_NO_BK_REFS = 13;
-  static const jint RE_NO_BK_VBAR = 14;
-  static const jint RE_NO_EMPTY_RANGES = 15;
-  static const jint RE_UNMATCHED_RIGHT_PAREN_ORD = 16;
-  static const jint RE_HAT_LISTS_NOT_NEWLINE = 17;
-  static const jint RE_STINGY_OPS = 18;
-  static const jint RE_CHAR_CLASS_ESCAPES = 19;
-  static const jint RE_PURE_GROUPING = 20;
-  static const jint RE_LOOKAHEAD = 21;
-  static const jint RE_STRING_ANCHORS = 22;
-  static const jint RE_COMMENTS = 23;
-  static const jint RE_CHAR_CLASS_ESC_IN_LISTS = 24;
-  static const jint RE_POSSESSIVE_OPS = 25;
-  static const jint RE_EMBEDDED_FLAGS = 26;
-  static const jint RE_OCTAL_CHAR = 27;
-  static const jint RE_HEX_CHAR = 28;
-  static const jint RE_UNICODE_CHAR = 29;
-  static const jint RE_NAMED_PROPERTY = 30;
-  static const jint RE_NESTED_CHARCLASS = 31;
-private:
-  static const jint BIT_TOTAL = 32;
-public:
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_AWK;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_ED;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_EGREP;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_EMACS;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_GREP;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_AWK;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_BASIC;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_EGREP;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_EXTENDED;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_MINIMAL_BASIC;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_POSIX_MINIMAL_EXTENDED;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_SED;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_PERL4;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_PERL4_S;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_PERL5;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_PERL5_S;
-  static ::gnu::java::util::regex::RESyntax * RE_SYNTAX_JAVA_1_4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RESyntax__
diff --git a/libjava/gnu/java/util/regex/REToken.h b/libjava/gnu/java/util/regex/REToken.h
deleted file mode 100644
index 552d47a..0000000
--- a/libjava/gnu/java/util/regex/REToken.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_REToken__
-#define __gnu_java_util_regex_REToken__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::REToken : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  REToken(jint);
-public: // actually package-private
-  virtual jint getMinimumLength();
-  virtual jint getMaximumLength();
-  virtual void setUncle(::gnu::java::util::regex::REToken *);
-  virtual jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual jboolean matchFake(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jboolean);
-public: // actually package-private
-  virtual void setHitEnd(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-public: // actually protected
-  virtual jboolean next(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-public: // actually package-private
-  virtual ::gnu::java::util::regex::REToken * getNext();
-  virtual ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual jboolean returnsFixedLengthMatches();
-  virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  virtual ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-  virtual jboolean chain(::gnu::java::util::regex::REToken *);
-  virtual void dump(::gnu::java::lang::CPStringBuilder *) = 0;
-  virtual void dumpAll(::gnu::java::lang::CPStringBuilder *);
-public:
-  virtual ::java::lang::String * toString();
-  static jchar toLowerCase(jchar, jboolean);
-  static jchar toUpperCase(jchar, jboolean);
-public: // actually protected
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next__;
-  ::gnu::java::util::regex::REToken * uncle;
-  jint subIndex;
-  jboolean unicodeAware;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_REToken__
diff --git a/libjava/gnu/java/util/regex/RETokenAny.h b/libjava/gnu/java/util/regex/RETokenAny.h
deleted file mode 100644
index 77f00aa..0000000
--- a/libjava/gnu/java/util/regex/RETokenAny.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenAny__
-#define __gnu_java_util_regex_RETokenAny__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenAny;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenAny : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenAny(jint, jboolean, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean matchOneChar(jchar);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline;
-  jboolean matchNull;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenAny__
diff --git a/libjava/gnu/java/util/regex/RETokenBackRef.h b/libjava/gnu/java/util/regex/RETokenBackRef.h
deleted file mode 100644
index 4cadd54..0000000
--- a/libjava/gnu/java/util/regex/RETokenBackRef.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenBackRef__
-#define __gnu_java_util_regex_RETokenBackRef__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenBackRef;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenBackRef : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenBackRef(jint, jint, jboolean);
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) num;
-  jboolean insens;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenBackRef__
diff --git a/libjava/gnu/java/util/regex/RETokenChar.h b/libjava/gnu/java/util/regex/RETokenChar.h
deleted file mode 100644
index 723bed8..0000000
--- a/libjava/gnu/java/util/regex/RETokenChar.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenChar__
-#define __gnu_java_util_regex_RETokenChar__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenChar;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenChar : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenChar(jint, jchar, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  jboolean matchOneString(::gnu::java::util::regex::CharIndexed *, jint);
-  jboolean charEquals(jchar, jchar);
-public: // actually package-private
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  jboolean chain(::gnu::java::util::regex::REToken *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) ch;
-  jboolean insens;
-  jint matchedLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenChar__
diff --git a/libjava/gnu/java/util/regex/RETokenEnd.h b/libjava/gnu/java/util/regex/RETokenEnd.h
deleted file mode 100644
index 975bb16..0000000
--- a/libjava/gnu/java/util/regex/RETokenEnd.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenEnd__
-#define __gnu_java_util_regex_RETokenEnd__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenEnd;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenEnd : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenEnd(jint, ::java::lang::String *);
-  RETokenEnd(jint, ::java::lang::String *, jboolean);
-  void setFake(jboolean);
-  jint getMaximumLength();
-  jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline;
-  jboolean check_java_line_terminators;
-  jboolean fake;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenEnd__
diff --git a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h b/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h
deleted file mode 100644
index be56833..0000000
--- a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenEndOfPreviousMatch__
-#define __gnu_java_util_regex_RETokenEndOfPreviousMatch__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenStart.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenEndOfPreviousMatch;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenEndOfPreviousMatch : public ::gnu::java::util::regex::RETokenStart
-{
-
-public: // actually package-private
-  RETokenEndOfPreviousMatch(jint);
-  virtual jint getMaximumLength();
-  virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual jboolean returnsFixedLengthmatches();
-  virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  virtual void dump(::gnu::java::lang::CPStringBuilder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenEndOfPreviousMatch__
diff --git a/libjava/gnu/java/util/regex/RETokenEndSub.h b/libjava/gnu/java/util/regex/RETokenEndSub.h
deleted file mode 100644
index 109e28b..0000000
--- a/libjava/gnu/java/util/regex/RETokenEndSub.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenEndSub__
-#define __gnu_java_util_regex_RETokenEndSub__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenEndSub;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenEndSub : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenEndSub(jint);
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void setHitEnd(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenEndSub__
diff --git a/libjava/gnu/java/util/regex/RETokenIndependent.h b/libjava/gnu/java/util/regex/RETokenIndependent.h
deleted file mode 100644
index 7800296..0000000
--- a/libjava/gnu/java/util/regex/RETokenIndependent.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenIndependent__
-#define __gnu_java_util_regex_RETokenIndependent__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenIndependent;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenIndependent : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenIndependent(::gnu::java::util::regex::REToken *);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenIndependent__
diff --git a/libjava/gnu/java/util/regex/RETokenLookAhead.h b/libjava/gnu/java/util/regex/RETokenLookAhead.h
deleted file mode 100644
index b3e1a72..0000000
--- a/libjava/gnu/java/util/regex/RETokenLookAhead.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenLookAhead__
-#define __gnu_java_util_regex_RETokenLookAhead__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenLookAhead;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenLookAhead : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenLookAhead(::gnu::java::util::regex::REToken *, jboolean);
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re;
-  jboolean negative;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenLookAhead__
diff --git a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h b/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h
deleted file mode 100644
index dc771b4..0000000
--- a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenLookBehind$RETokenMatchHereOnly__
-#define __gnu_java_util_regex_RETokenLookBehind$RETokenMatchHereOnly__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenLookBehind$RETokenMatchHereOnly;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenLookBehind$RETokenMatchHereOnly : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  virtual jint getMaximumLength();
-  RETokenLookBehind$RETokenMatchHereOnly(jint);
-  virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenLookBehind$RETokenMatchHereOnly__
diff --git a/libjava/gnu/java/util/regex/RETokenLookBehind.h b/libjava/gnu/java/util/regex/RETokenLookBehind.h
deleted file mode 100644
index 3aa8013..0000000
--- a/libjava/gnu/java/util/regex/RETokenLookBehind.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenLookBehind__
-#define __gnu_java_util_regex_RETokenLookBehind__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenLookBehind;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenLookBehind : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenLookBehind(::gnu::java::util::regex::REToken *, jboolean);
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re;
-  jboolean negative;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenLookBehind__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$1.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$1.h
deleted file mode 100644
index 559e061..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$1__
-#define __gnu_java_util_regex_RETokenNamedProperty$1__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty;
-            class RETokenNamedProperty$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$1 : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public: // actually package-private
-  RETokenNamedProperty$1(::gnu::java::util::regex::RETokenNamedProperty *);
-public:
-  virtual jboolean includes(jchar);
-public: // actually package-private
-  ::gnu::java::util::regex::RETokenNamedProperty * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$1__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$Handler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$Handler.h
deleted file mode 100644
index bc5efe1..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$Handler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$Handler__
-#define __gnu_java_util_regex_RETokenNamedProperty$Handler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$Handler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$Handler : public ::java::lang::Object
-{
-
-  RETokenNamedProperty$Handler();
-public:
-  virtual jboolean includes(jchar) = 0;
-public: // actually package-private
-  RETokenNamedProperty$Handler(::gnu::java::util::regex::RETokenNamedProperty$Handler *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$Handler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h
deleted file mode 100644
index 8c9e229..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$JavaCategoryHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$JavaCategoryHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$JavaCategoryHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$JavaCategoryHandler(::java::lang::reflect::Method *);
-  virtual jboolean includes(jchar);
-private:
-  ::java::lang::reflect::Method * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) method;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$JavaCategoryHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.h
deleted file mode 100644
index 121accc..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$POSIXHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$POSIXHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$POSIXHandler;
-            class RETokenPOSIX;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$POSIXHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$POSIXHandler(::java::lang::String *);
-  virtual jboolean includes(jchar);
-private:
-  ::gnu::java::util::regex::RETokenPOSIX * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) retoken;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$POSIXHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.h
deleted file mode 100644
index c2890ed..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$UnicodeBlockHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$UnicodeBlockHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$UnicodeBlockHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$UnicodeBlockHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$UnicodeBlockHandler(::java::lang::Character$UnicodeBlock *);
-  virtual jboolean includes(jchar);
-private:
-  ::java::lang::Character$UnicodeBlock * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) block;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$UnicodeBlockHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.h
deleted file mode 100644
index af6c5ae..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoriesHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoriesHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$UnicodeCategoriesHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$UnicodeCategoriesHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$UnicodeCategoriesHandler(JArray< jbyte > *);
-  virtual jboolean includes(jchar);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) categories;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoriesHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.h
deleted file mode 100644
index f090dbd..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoryHandler__
-#define __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoryHandler__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RETokenNamedProperty$Handler.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenNamedProperty$UnicodeCategoryHandler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty$UnicodeCategoryHandler : public ::gnu::java::util::regex::RETokenNamedProperty$Handler
-{
-
-public:
-  RETokenNamedProperty$UnicodeCategoryHandler(jbyte);
-  virtual jboolean includes(jchar);
-private:
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::RETokenNamedProperty$Handler)))) category;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty$UnicodeCategoryHandler__
diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty.h b/libjava/gnu/java/util/regex/RETokenNamedProperty.h
deleted file mode 100644
index a20a1a3..0000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenNamedProperty__
-#define __gnu_java_util_regex_RETokenNamedProperty__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenNamedProperty;
-            class RETokenNamedProperty$Handler;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenNamedProperty : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenNamedProperty(jint, ::java::lang::String *, jboolean, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  jboolean matchOneChar(jchar);
-public: // actually package-private
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::gnu::java::util::regex::RETokenNamedProperty$Handler * getHandler(::java::lang::String *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) name;
-  jboolean insens;
-  jboolean negate;
-  ::gnu::java::util::regex::RETokenNamedProperty$Handler * handler;
-  static JArray< jbyte > * LETTER;
-  static JArray< jbyte > * MARK;
-  static JArray< jbyte > * SEPARATOR;
-  static JArray< jbyte > * SYMBOL;
-  static JArray< jbyte > * NUMBER;
-  static JArray< jbyte > * PUNCTUATION;
-  static JArray< jbyte > * OTHER;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenNamedProperty__
diff --git a/libjava/gnu/java/util/regex/RETokenOneOf.h b/libjava/gnu/java/util/regex/RETokenOneOf.h
deleted file mode 100644
index b7f819d..0000000
--- a/libjava/gnu/java/util/regex/RETokenOneOf.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenOneOf__
-#define __gnu_java_util_regex_RETokenOneOf__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenOneOf;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenOneOf : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenOneOf(jint, ::java::lang::String *, jboolean, jboolean);
-  RETokenOneOf(jint, ::java::util::List *, jboolean);
-  RETokenOneOf(jint, ::java::util::List *, ::java::util::List *, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean matchOneChar(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  jboolean matchN(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jboolean);
-  jboolean matchP(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jboolean);
-  jboolean matchOneRE(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-public: // actually package-private
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-private:
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-public: // actually package-private
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) options;
-  jboolean negative;
-  jboolean matchesOneChar;
-  ::java::util::List * addition;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenOneOf__
diff --git a/libjava/gnu/java/util/regex/RETokenPOSIX.h b/libjava/gnu/java/util/regex/RETokenPOSIX.h
deleted file mode 100644
index 5704ab8..0000000
--- a/libjava/gnu/java/util/regex/RETokenPOSIX.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenPOSIX__
-#define __gnu_java_util_regex_RETokenPOSIX__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenPOSIX;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenPOSIX : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  static jint intValue(::java::lang::String *);
-  RETokenPOSIX(jint, jint, jboolean, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean matchOneChar(jchar);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) type;
-  jboolean insens;
-  jboolean negated;
-  static const jint ALNUM = 0;
-  static const jint ALPHA = 1;
-  static const jint BLANK = 2;
-  static const jint CNTRL = 3;
-  static const jint DIGIT = 4;
-  static const jint GRAPH = 5;
-  static const jint LOWER = 6;
-  static const jint PRINT = 7;
-  static const jint PUNCT = 8;
-  static const jint SPACE = 9;
-  static const jint UPPER = 10;
-  static const jint XDIGIT = 11;
-  static JArray< ::java::lang::String * > * s_nameTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenPOSIX__
diff --git a/libjava/gnu/java/util/regex/RETokenRange.h b/libjava/gnu/java/util/regex/RETokenRange.h
deleted file mode 100644
index fa3c923..0000000
--- a/libjava/gnu/java/util/regex/RETokenRange.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRange__
-#define __gnu_java_util_regex_RETokenRange__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenRange;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRange : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenRange(jint, jchar, jchar, jboolean);
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean matchOneChar(jchar);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jchar __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) lo;
-  jchar hi;
-  jboolean insens;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRange__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$DoablesFinder.h b/libjava/gnu/java/util/regex/RETokenRepeated$DoablesFinder.h
deleted file mode 100644
index 8b92ce5..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$DoablesFinder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$DoablesFinder__
-#define __gnu_java_util_regex_RETokenRepeated$DoablesFinder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenRepeated$DoablesFinder;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$DoablesFinder : public ::java::lang::Object
-{
-
-  RETokenRepeated$DoablesFinder(::gnu::java::util::regex::REToken *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * find();
-public: // actually package-private
-  virtual jboolean noMore();
-  RETokenRepeated$DoablesFinder(::gnu::java::util::regex::REToken *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::gnu::java::util::regex::RETokenRepeated$DoablesFinder *);
-  static ::gnu::java::util::regex::REMatch * access$1(::gnu::java::util::regex::RETokenRepeated$DoablesFinder *);
-private:
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tk;
-  ::gnu::java::util::regex::CharIndexed * input;
-  ::gnu::java::util::regex::REMatch * rematch;
-  jboolean findFirst;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$DoablesFinder__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControl.h b/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControl.h
deleted file mode 100644
index 5858aed..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$FindMatchControl__
-#define __gnu_java_util_regex_RETokenRepeated$FindMatchControl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenRepeated$DoablesFinder;
-            class RETokenRepeated$FindMatchControl;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$FindMatchControl : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RETokenRepeated$FindMatchControl(::gnu::java::util::regex::RETokenRepeated$DoablesFinder *);
-  ::gnu::java::util::regex::RETokenRepeated$DoablesFinder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) finder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$FindMatchControl__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$StackedInfo.h b/libjava/gnu/java/util/regex/RETokenRepeated$StackedInfo.h
deleted file mode 100644
index 6253b64..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$StackedInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$StackedInfo__
-#define __gnu_java_util_regex_RETokenRepeated$StackedInfo__
-
-#pragma interface
-
-#include <gnu/java/util/regex/BacktrackStack$Backtrack.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenRepeated$DoablesFinder;
-            class RETokenRepeated$StackedInfo;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$StackedInfo : public ::gnu::java::util::regex::BacktrackStack$Backtrack
-{
-
-public: // actually package-private
-  RETokenRepeated$StackedInfo(::gnu::java::util::regex::CharIndexed *, jint, ::gnu::java::util::regex::REMatch *, JArray< jint > *, ::gnu::java::util::regex::RETokenRepeated$DoablesFinder *);
-  jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::BacktrackStack$Backtrack)))) numRepeats;
-  JArray< jint > * visited;
-  ::gnu::java::util::regex::RETokenRepeated$DoablesFinder * finder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$StackedInfo__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.h b/libjava/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.h
deleted file mode 100644
index 5a6ef3b..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$TryAnotherResult__
-#define __gnu_java_util_regex_RETokenRepeated$TryAnotherResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class REMatch;
-            class RETokenRepeated$TryAnotherResult;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$TryAnotherResult : public ::java::lang::Object
-{
-
-  RETokenRepeated$TryAnotherResult();
-public: // actually package-private
-  RETokenRepeated$TryAnotherResult(::gnu::java::util::regex::RETokenRepeated$TryAnotherResult *);
-  ::gnu::java::util::regex::REMatch * __attribute__((aligned(__alignof__( ::java::lang::Object)))) result;
-  jint status;
-  static const jint RESULT_FOUND = 1;
-  static const jint TRY_FURTHER = 2;
-  static const jint NOTHING_FOUND = 3;
-  JArray< jint > * visited;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$TryAnotherResult__
diff --git a/libjava/gnu/java/util/regex/RETokenRepeated.h b/libjava/gnu/java/util/regex/RETokenRepeated.h
deleted file mode 100644
index 09aca7a..0000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated__
-#define __gnu_java_util_regex_RETokenRepeated__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class BacktrackStack;
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenRepeated;
-            class RETokenRepeated$DoablesFinder;
-            class RETokenRepeated$TryAnotherResult;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenRepeated(jint, ::gnu::java::util::regex::REToken *, jint, jint);
-  void makeStingy();
-  jboolean isStingy();
-  void makePossessive();
-  jboolean isPossessive();
-  jint getMinimumLength();
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-private:
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *);
-  ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *, ::java::util::Deque *);
-  ::gnu::java::util::regex::RETokenRepeated$TryAnotherResult * tryAnother(::gnu::java::util::regex::BacktrackStack *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint, ::gnu::java::util::regex::RETokenRepeated$DoablesFinder *, JArray< jint > *);
-public: // actually package-private
-  jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-private:
-  static JArray< jint > * initVisited();
-  static jboolean visitedContains(jint, JArray< jint > *);
-  static JArray< jint > * addVisited(jint, JArray< jint > *);
-  ::gnu::java::util::regex::REMatch * matchRest(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * findMatchFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  ::gnu::java::util::regex::REMatch * backtrackFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *);
-  ::gnu::java::util::regex::REMatch * findMatchFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint, jint);
-public: // actually package-private
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) token;
-  jint min;
-  jint max;
-  jboolean stingy;
-  jboolean possessive;
-  jint tokenFixedLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated__
diff --git a/libjava/gnu/java/util/regex/RETokenStart.h b/libjava/gnu/java/util/regex/RETokenStart.h
deleted file mode 100644
index 95654f7..0000000
--- a/libjava/gnu/java/util/regex/RETokenStart.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenStart__
-#define __gnu_java_util_regex_RETokenStart__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenStart;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenStart : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenStart(jint, ::java::lang::String *);
-  RETokenStart(jint, ::java::lang::String *, jboolean);
-  virtual jint getMaximumLength();
-  virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  virtual jboolean returnsFixedLengthMatches();
-  virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  virtual void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline;
-  jboolean check_java_line_terminators;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenStart__
diff --git a/libjava/gnu/java/util/regex/RETokenWordBoundary.h b/libjava/gnu/java/util/regex/RETokenWordBoundary.h
deleted file mode 100644
index 18d5b2c..0000000
--- a/libjava/gnu/java/util/regex/RETokenWordBoundary.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenWordBoundary__
-#define __gnu_java_util_regex_RETokenWordBoundary__
-
-#pragma interface
-
-#include <gnu/java/util/regex/REToken.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-          class CPStringBuilder;
-      }
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-            class RETokenWordBoundary;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenWordBoundary : public ::gnu::java::util::regex::REToken
-{
-
-public: // actually package-private
-  RETokenWordBoundary(jint, jint, jboolean);
-  jint getMaximumLength();
-  ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *);
-  jboolean returnsFixedLengthMatches();
-  jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint);
-  void dump(::gnu::java::lang::CPStringBuilder *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) negated;
-  jint where;
-public: // actually package-private
-  static const jint BEGIN = 1;
-  static const jint END = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenWordBoundary__
diff --git a/libjava/gnu/java/util/regex/UncheckedRE.h b/libjava/gnu/java/util/regex/UncheckedRE.h
deleted file mode 100644
index 23a2898..0000000
--- a/libjava/gnu/java/util/regex/UncheckedRE.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_UncheckedRE__
-#define __gnu_java_util_regex_UncheckedRE__
-
-#pragma interface
-
-#include <gnu/java/util/regex/RE.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RESyntax;
-            class UncheckedRE;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::UncheckedRE : public ::gnu::java::util::regex::RE
-{
-
-public:
-  UncheckedRE(::java::lang::Object *);
-  UncheckedRE(::java::lang::Object *, jint);
-  UncheckedRE(::java::lang::Object *, jint, ::gnu::java::util::regex::RESyntax *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_UncheckedRE__