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

2098 files changed, 0 insertions, 110767 deletions

diff --git a/libjava/javax/accessibility/Accessible.h b/libjava/javax/accessibility/Accessible.h
deleted file mode 100644
index 04dab4e5794..00000000000
--- a/libjava/javax/accessibility/Accessible.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_Accessible__
-#define __javax_accessibility_Accessible__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-    }
-  }
-}
-
-class javax::accessibility::Accessible : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_Accessible__
diff --git a/libjava/javax/accessibility/AccessibleAction.h b/libjava/javax/accessibility/AccessibleAction.h
deleted file mode 100644
index 5a8b4b28a00..00000000000
--- a/libjava/javax/accessibility/AccessibleAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleAction__
-#define __javax_accessibility_AccessibleAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleAction : public ::java::lang::Object
-{
-
-public:
-  virtual jint getAccessibleActionCount() = 0;
-  virtual ::java::lang::String * getAccessibleActionDescription(jint) = 0;
-  virtual jboolean doAccessibleAction(jint) = 0;
-  static ::java::lang::String * DECREMENT;
-  static ::java::lang::String * INCREMENT;
-  static ::java::lang::String * TOGGLE_EXPAND;
-  static ::java::lang::String * CLICK;
-  static ::java::lang::String * TOGGLE_POPUP;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleAction__
diff --git a/libjava/javax/accessibility/AccessibleAttributeSequence.h b/libjava/javax/accessibility/AccessibleAttributeSequence.h
deleted file mode 100644
index 10d85711db1..00000000000
--- a/libjava/javax/accessibility/AccessibleAttributeSequence.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleAttributeSequence__
-#define __javax_accessibility_AccessibleAttributeSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAttributeSequence;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::accessibility::AccessibleAttributeSequence : public ::java::lang::Object
-{
-
-public:
-  AccessibleAttributeSequence(jint, jint, ::javax::swing::text::AttributeSet *);
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
-  jint startIndex;
-  jint endIndex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleAttributeSequence__
diff --git a/libjava/javax/accessibility/AccessibleBundle.h b/libjava/javax/accessibility/AccessibleBundle.h
deleted file mode 100644
index 65413778af7..00000000000
--- a/libjava/javax/accessibility/AccessibleBundle.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleBundle__
-#define __javax_accessibility_AccessibleBundle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleBundle;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleBundle : public ::java::lang::Object
-{
-
-public:
-  AccessibleBundle();
-public: // actually protected
-  virtual ::java::lang::String * toDisplayString(::java::lang::String *, ::java::util::Locale *);
-public:
-  virtual ::java::lang::String * toDisplayString(::java::util::Locale *);
-  virtual ::java::lang::String * toDisplayString();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleBundle__
diff --git a/libjava/javax/accessibility/AccessibleComponent.h b/libjava/javax/accessibility/AccessibleComponent.h
deleted file mode 100644
index 3f260f24c31..00000000000
--- a/libjava/javax/accessibility/AccessibleComponent.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleComponent__
-#define __javax_accessibility_AccessibleComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleComponent;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleComponent : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Color * getBackground() = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Color * getForeground() = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Cursor * getCursor() = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual jboolean isEnabled() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual jboolean isVisible() = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual jboolean isShowing() = 0;
-  virtual jboolean contains(::java::awt::Point *) = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Point * getLocation() = 0;
-  virtual void setLocation(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void setBounds(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::Dimension * getSize() = 0;
-  virtual void setSize(::java::awt::Dimension *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *) = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual void requestFocus() = 0;
-  virtual void addFocusListener(::java::awt::event::FocusListener *) = 0;
-  virtual void removeFocusListener(::java::awt::event::FocusListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleComponent__
diff --git a/libjava/javax/accessibility/AccessibleContext.h b/libjava/javax/accessibility/AccessibleContext.h
deleted file mode 100644
index 764af3aa883..00000000000
--- a/libjava/javax/accessibility/AccessibleContext.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleContext__
-#define __javax_accessibility_AccessibleContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleAction;
-        class AccessibleComponent;
-        class AccessibleContext;
-        class AccessibleEditableText;
-        class AccessibleIcon;
-        class AccessibleRelationSet;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-        class AccessibleTable;
-        class AccessibleText;
-        class AccessibleValue;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleContext : public ::java::lang::Object
-{
-
-public:
-  AccessibleContext();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual void setAccessibleName(::java::lang::String *);
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual void setAccessibleDescription(::java::lang::String *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole() = 0;
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleParent();
-  virtual void setAccessibleParent(::javax::accessibility::Accessible *);
-  virtual jint getAccessibleIndexInParent() = 0;
-  virtual jint getAccessibleChildrenCount() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint) = 0;
-  virtual ::java::util::Locale * getLocale() = 0;
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual ::javax::accessibility::AccessibleEditableText * getAccessibleEditableText();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual JArray< ::javax::accessibility::AccessibleIcon * > * getAccessibleIcon();
-  virtual ::javax::accessibility::AccessibleRelationSet * getAccessibleRelationSet();
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleTable();
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::String * ACCESSIBLE_NAME_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_DESCRIPTION_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_STATE_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_VALUE_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_SELECTION_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_TEXT_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_CARET_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_VISIBLE_DATA_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_CHILD_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_TABLE_CAPTION_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_SUMMARY_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_MODEL_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_ROW_HEADER_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_ROW_DESCRIPTION_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_COLUMN_HEADER_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_COLUMN_DESCRIPTION_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_ACTION_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_HYPERTEXT_OFFSET;
-  static ::java::lang::String * ACCESSIBLE_COMPONENT_BOUNDS_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_INVALIDATE_CHILDREN;
-  static ::java::lang::String * ACCESSIBLE_TEXT_ATTRIBUTES_CHANGED;
-public: // actually protected
-  ::javax::accessibility::Accessible * __attribute__((aligned(__alignof__( ::java::lang::Object)))) accessibleParent;
-  ::java::lang::String * accessibleName;
-  ::java::lang::String * accessibleDescription;
-private:
-  ::java::beans::PropertyChangeSupport * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleContext__
diff --git a/libjava/javax/accessibility/AccessibleEditableText.h b/libjava/javax/accessibility/AccessibleEditableText.h
deleted file mode 100644
index 715abae2ff3..00000000000
--- a/libjava/javax/accessibility/AccessibleEditableText.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleEditableText__
-#define __javax_accessibility_AccessibleEditableText__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleEditableText;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::accessibility::AccessibleEditableText : public ::java::lang::Object
-{
-
-public:
-  virtual void setTextContents(::java::lang::String *) = 0;
-  virtual void insertTextAtIndex(jint, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTextRange(jint, jint) = 0;
-  virtual void delete$(jint, jint) = 0;
-  virtual void cut(jint, jint) = 0;
-  virtual void paste(jint) = 0;
-  virtual void replaceText(jint, jint, ::java::lang::String *) = 0;
-  virtual void selectText(jint, jint) = 0;
-  virtual void setAttributes(jint, jint, ::javax::swing::text::AttributeSet *) = 0;
-  virtual jint getIndexAtPoint(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jint getCharCount() = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual ::java::lang::String * getAtIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getAfterIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getBeforeIndex(jint, jint) = 0;
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint) = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual ::java::lang::String * getSelectedText() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleEditableText__
diff --git a/libjava/javax/accessibility/AccessibleExtendedComponent.h b/libjava/javax/accessibility/AccessibleExtendedComponent.h
deleted file mode 100644
index 92563b3b435..00000000000
--- a/libjava/javax/accessibility/AccessibleExtendedComponent.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleExtendedComponent__
-#define __javax_accessibility_AccessibleExtendedComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleExtendedComponent;
-        class AccessibleKeyBinding;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleExtendedComponent : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getToolTipText() = 0;
-  virtual ::java::lang::String * getTitledBorderText() = 0;
-  virtual ::javax::accessibility::AccessibleKeyBinding * getAccessibleKeyBinding() = 0;
-  virtual ::java::awt::Color * getBackground() = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Color * getForeground() = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Cursor * getCursor() = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual jboolean isEnabled() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual jboolean isVisible() = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual jboolean isShowing() = 0;
-  virtual jboolean contains(::java::awt::Point *) = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Point * getLocation() = 0;
-  virtual void setLocation(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void setBounds(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::Dimension * getSize() = 0;
-  virtual void setSize(::java::awt::Dimension *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *) = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual void requestFocus() = 0;
-  virtual void addFocusListener(::java::awt::event::FocusListener *) = 0;
-  virtual void removeFocusListener(::java::awt::event::FocusListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleExtendedComponent__
diff --git a/libjava/javax/accessibility/AccessibleExtendedTable.h b/libjava/javax/accessibility/AccessibleExtendedTable.h
deleted file mode 100644
index 995b3e50c62..00000000000
--- a/libjava/javax/accessibility/AccessibleExtendedTable.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleExtendedTable__
-#define __javax_accessibility_AccessibleExtendedTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleExtendedTable;
-        class AccessibleTable;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleExtendedTable : public ::java::lang::Object
-{
-
-public:
-  virtual jint getAccessibleRow(jint) = 0;
-  virtual jint getAccessibleColumn(jint) = 0;
-  virtual jint getAccessibleIndex(jint, jint) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleCaption() = 0;
-  virtual void setAccessibleCaption(::javax::accessibility::Accessible *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleSummary() = 0;
-  virtual void setAccessibleSummary(::javax::accessibility::Accessible *) = 0;
-  virtual jint getAccessibleRowCount() = 0;
-  virtual jint getAccessibleColumnCount() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint) = 0;
-  virtual jint getAccessibleRowExtentAt(jint, jint) = 0;
-  virtual jint getAccessibleColumnExtentAt(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader() = 0;
-  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *) = 0;
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader() = 0;
-  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint) = 0;
-  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint) = 0;
-  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *) = 0;
-  virtual jboolean isAccessibleSelected(jint, jint) = 0;
-  virtual jboolean isAccessibleRowSelected(jint) = 0;
-  virtual jboolean isAccessibleColumnSelected(jint) = 0;
-  virtual JArray< jint > * getSelectedAccessibleRows() = 0;
-  virtual JArray< jint > * getSelectedAccessibleColumns() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleExtendedTable__
diff --git a/libjava/javax/accessibility/AccessibleExtendedText.h b/libjava/javax/accessibility/AccessibleExtendedText.h
deleted file mode 100644
index b947e664356..00000000000
--- a/libjava/javax/accessibility/AccessibleExtendedText.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleExtendedText__
-#define __javax_accessibility_AccessibleExtendedText__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleExtendedText;
-        class AccessibleTextSequence;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleExtendedText : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Rectangle * getTextBounds(jint, jint) = 0;
-  virtual ::java::lang::String * getTextRange(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTextSequence * getTextSequenceAfter(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTextSequence * getTextSequenceAt(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTextSequence * getTextSequenceBefore(jint, jint) = 0;
-  static const jint LINE = 4;
-  static const jint ATTRIBUTE_RUN = 5;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleExtendedText__
diff --git a/libjava/javax/accessibility/AccessibleHyperlink.h b/libjava/javax/accessibility/AccessibleHyperlink.h
deleted file mode 100644
index 08833559f19..00000000000
--- a/libjava/javax/accessibility/AccessibleHyperlink.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleHyperlink__
-#define __javax_accessibility_AccessibleHyperlink__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleHyperlink;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleHyperlink : public ::java::lang::Object
-{
-
-public:
-  AccessibleHyperlink();
-  virtual jboolean isValid() = 0;
-  virtual jint getAccessibleActionCount() = 0;
-  virtual jboolean doAccessibleAction(jint) = 0;
-  virtual ::java::lang::String * getAccessibleActionDescription(jint) = 0;
-  virtual ::java::lang::Object * getAccessibleActionObject(jint) = 0;
-  virtual ::java::lang::Object * getAccessibleActionAnchor(jint) = 0;
-  virtual jint getStartIndex() = 0;
-  virtual jint getEndIndex() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleHyperlink__
diff --git a/libjava/javax/accessibility/AccessibleHypertext.h b/libjava/javax/accessibility/AccessibleHypertext.h
deleted file mode 100644
index 0aac63529ad..00000000000
--- a/libjava/javax/accessibility/AccessibleHypertext.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleHypertext__
-#define __javax_accessibility_AccessibleHypertext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleHyperlink;
-        class AccessibleHypertext;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::accessibility::AccessibleHypertext : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLinkCount() = 0;
-  virtual ::javax::accessibility::AccessibleHyperlink * getLink(jint) = 0;
-  virtual jint getLinkIndex(jint) = 0;
-  virtual jint getIndexAtPoint(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jint getCharCount() = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual ::java::lang::String * getAtIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getAfterIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getBeforeIndex(jint, jint) = 0;
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint) = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual ::java::lang::String * getSelectedText() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleHypertext__
diff --git a/libjava/javax/accessibility/AccessibleIcon.h b/libjava/javax/accessibility/AccessibleIcon.h
deleted file mode 100644
index c2966204818..00000000000
--- a/libjava/javax/accessibility/AccessibleIcon.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleIcon__
-#define __javax_accessibility_AccessibleIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleIcon;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleIcon : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAccessibleIconDescription() = 0;
-  virtual void setAccessibleIconDescription(::java::lang::String *) = 0;
-  virtual jint getAccessibleIconWidth() = 0;
-  virtual jint getAccessibleIconHeight() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleIcon__
diff --git a/libjava/javax/accessibility/AccessibleKeyBinding.h b/libjava/javax/accessibility/AccessibleKeyBinding.h
deleted file mode 100644
index 472b7d0b761..00000000000
--- a/libjava/javax/accessibility/AccessibleKeyBinding.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleKeyBinding__
-#define __javax_accessibility_AccessibleKeyBinding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleKeyBinding;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleKeyBinding : public ::java::lang::Object
-{
-
-public:
-  virtual jint getAccessibleKeyBindingCount() = 0;
-  virtual ::java::lang::Object * getAccessibleKeyBinding(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleKeyBinding__
diff --git a/libjava/javax/accessibility/AccessibleRelation.h b/libjava/javax/accessibility/AccessibleRelation.h
deleted file mode 100644
index f0d3a9dab99..00000000000
--- a/libjava/javax/accessibility/AccessibleRelation.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleRelation__
-#define __javax_accessibility_AccessibleRelation__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRelation;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleRelation : public ::javax::accessibility::AccessibleBundle
-{
-
-public:
-  AccessibleRelation(::java::lang::String *);
-  AccessibleRelation(::java::lang::String *, ::java::lang::Object *);
-  AccessibleRelation(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * getKey();
-  virtual JArray< ::java::lang::Object * > * getTarget();
-  virtual void setTarget(::java::lang::Object *);
-  virtual void setTarget(JArray< ::java::lang::Object * > *);
-  static ::java::lang::String * LABEL_FOR;
-  static ::java::lang::String * LABELED_BY;
-  static ::java::lang::String * MEMBER_OF;
-  static ::java::lang::String * CONTROLLER_FOR;
-  static ::java::lang::String * CONTROLLED_BY;
-  static ::java::lang::String * LABEL_FOR_PROPERTY;
-  static ::java::lang::String * LABELED_BY_PROPERTY;
-  static ::java::lang::String * MEMBER_OF_PROPERTY;
-  static ::java::lang::String * CONTROLLER_FOR_PROPERTY;
-  static ::java::lang::String * CONTROLLED_BY_PROPERTY;
-  static ::java::lang::String * CHILD_NODE_OF;
-  static ::java::lang::String * CHILD_NODE_OF_PROPERTY;
-  static ::java::lang::String * EMBEDDED_BY;
-  static ::java::lang::String * EMBEDDED_BY_PROPERTY;
-  static ::java::lang::String * EMBEDS;
-  static ::java::lang::String * EMBEDS_PROPERTY;
-  static ::java::lang::String * FLOWS_FROM;
-  static ::java::lang::String * FLOWS_FROM_PROPERTY;
-  static ::java::lang::String * FLOWS_TO;
-  static ::java::lang::String * FLOWS_TO_PROPERTY;
-  static ::java::lang::String * PARENT_WINDOW_OF;
-  static ::java::lang::String * PARENT_WINDOW_OF_PROPERTY;
-  static ::java::lang::String * SUBWINDOW_OF;
-  static ::java::lang::String * SUBWINDOW_OF_PROPERTY;
-private:
-  static JArray< ::java::lang::Object * > * EMPTY_TARGETS;
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleBundle)))) targets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleRelation__
diff --git a/libjava/javax/accessibility/AccessibleRelationSet.h b/libjava/javax/accessibility/AccessibleRelationSet.h
deleted file mode 100644
index 6c2d4d42afd..00000000000
--- a/libjava/javax/accessibility/AccessibleRelationSet.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleRelationSet__
-#define __javax_accessibility_AccessibleRelationSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRelation;
-        class AccessibleRelationSet;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleRelationSet : public ::java::lang::Object
-{
-
-public:
-  AccessibleRelationSet();
-  AccessibleRelationSet(JArray< ::javax::accessibility::AccessibleRelation * > *);
-  virtual jboolean add(::javax::accessibility::AccessibleRelation *);
-  virtual void addAll(JArray< ::javax::accessibility::AccessibleRelation * > *);
-  virtual jboolean remove(::javax::accessibility::AccessibleRelation *);
-  virtual void clear();
-  virtual jint size();
-  virtual jboolean contains(::java::lang::String *);
-  virtual ::javax::accessibility::AccessibleRelation * get(::java::lang::String *);
-  virtual JArray< ::javax::accessibility::AccessibleRelation * > * toArray();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) relations;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleRelationSet__
diff --git a/libjava/javax/accessibility/AccessibleResourceBundle.h b/libjava/javax/accessibility/AccessibleResourceBundle.h
deleted file mode 100644
index 87370a8a23d..00000000000
--- a/libjava/javax/accessibility/AccessibleResourceBundle.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleResourceBundle__
-#define __javax_accessibility_AccessibleResourceBundle__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleResourceBundle;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleResourceBundle : public ::java::util::ListResourceBundle
-{
-
-public:
-  AccessibleResourceBundle();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleResourceBundle__
diff --git a/libjava/javax/accessibility/AccessibleRole.h b/libjava/javax/accessibility/AccessibleRole.h
deleted file mode 100644
index 271b6ba7b7b..00000000000
--- a/libjava/javax/accessibility/AccessibleRole.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleRole__
-#define __javax_accessibility_AccessibleRole__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleBundle.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleRole : public ::javax::accessibility::AccessibleBundle
-{
-
-public: // actually protected
-  AccessibleRole(::java::lang::String *);
-public:
-  static ::javax::accessibility::AccessibleRole * ALERT;
-  static ::javax::accessibility::AccessibleRole * COLUMN_HEADER;
-  static ::javax::accessibility::AccessibleRole * CANVAS;
-  static ::javax::accessibility::AccessibleRole * COMBO_BOX;
-  static ::javax::accessibility::AccessibleRole * DESKTOP_ICON;
-  static ::javax::accessibility::AccessibleRole * INTERNAL_FRAME;
-  static ::javax::accessibility::AccessibleRole * DESKTOP_PANE;
-  static ::javax::accessibility::AccessibleRole * OPTION_PANE;
-  static ::javax::accessibility::AccessibleRole * WINDOW;
-  static ::javax::accessibility::AccessibleRole * FRAME;
-  static ::javax::accessibility::AccessibleRole * DIALOG;
-  static ::javax::accessibility::AccessibleRole * COLOR_CHOOSER;
-  static ::javax::accessibility::AccessibleRole * DIRECTORY_PANE;
-  static ::javax::accessibility::AccessibleRole * FILE_CHOOSER;
-  static ::javax::accessibility::AccessibleRole * FILLER;
-  static ::javax::accessibility::AccessibleRole * HYPERLINK;
-  static ::javax::accessibility::AccessibleRole * ICON;
-  static ::javax::accessibility::AccessibleRole * LABEL;
-  static ::javax::accessibility::AccessibleRole * ROOT_PANE;
-  static ::javax::accessibility::AccessibleRole * GLASS_PANE;
-  static ::javax::accessibility::AccessibleRole * LAYERED_PANE;
-  static ::javax::accessibility::AccessibleRole * LIST;
-  static ::javax::accessibility::AccessibleRole * LIST_ITEM;
-  static ::javax::accessibility::AccessibleRole * MENU_BAR;
-  static ::javax::accessibility::AccessibleRole * POPUP_MENU;
-  static ::javax::accessibility::AccessibleRole * MENU;
-  static ::javax::accessibility::AccessibleRole * MENU_ITEM;
-  static ::javax::accessibility::AccessibleRole * SEPARATOR;
-  static ::javax::accessibility::AccessibleRole * PAGE_TAB_LIST;
-  static ::javax::accessibility::AccessibleRole * PAGE_TAB;
-  static ::javax::accessibility::AccessibleRole * PANEL;
-  static ::javax::accessibility::AccessibleRole * PROGRESS_BAR;
-  static ::javax::accessibility::AccessibleRole * PASSWORD_TEXT;
-  static ::javax::accessibility::AccessibleRole * PUSH_BUTTON;
-  static ::javax::accessibility::AccessibleRole * TOGGLE_BUTTON;
-  static ::javax::accessibility::AccessibleRole * CHECK_BOX;
-  static ::javax::accessibility::AccessibleRole * RADIO_BUTTON;
-  static ::javax::accessibility::AccessibleRole * ROW_HEADER;
-  static ::javax::accessibility::AccessibleRole * SCROLL_PANE;
-  static ::javax::accessibility::AccessibleRole * SCROLL_BAR;
-  static ::javax::accessibility::AccessibleRole * VIEWPORT;
-  static ::javax::accessibility::AccessibleRole * SLIDER;
-  static ::javax::accessibility::AccessibleRole * SPLIT_PANE;
-  static ::javax::accessibility::AccessibleRole * TABLE;
-  static ::javax::accessibility::AccessibleRole * TEXT;
-  static ::javax::accessibility::AccessibleRole * TREE;
-  static ::javax::accessibility::AccessibleRole * TOOL_BAR;
-  static ::javax::accessibility::AccessibleRole * TOOL_TIP;
-  static ::javax::accessibility::AccessibleRole * AWT_COMPONENT;
-  static ::javax::accessibility::AccessibleRole * SWING_COMPONENT;
-  static ::javax::accessibility::AccessibleRole * UNKNOWN;
-  static ::javax::accessibility::AccessibleRole * STATUS_BAR;
-  static ::javax::accessibility::AccessibleRole * DATE_EDITOR;
-  static ::javax::accessibility::AccessibleRole * SPIN_BOX;
-  static ::javax::accessibility::AccessibleRole * FONT_CHOOSER;
-  static ::javax::accessibility::AccessibleRole * GROUP_BOX;
-  static ::javax::accessibility::AccessibleRole * EDITBAR;
-  static ::javax::accessibility::AccessibleRole * FOOTER;
-  static ::javax::accessibility::AccessibleRole * HEADER;
-  static ::javax::accessibility::AccessibleRole * PARAGRAPH;
-  static ::javax::accessibility::AccessibleRole * PROGRESS_MONITOR;
-  static ::javax::accessibility::AccessibleRole * RULER;
-  static ::javax::accessibility::AccessibleRole * HTML_CONTAINER;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleRole__
diff --git a/libjava/javax/accessibility/AccessibleSelection.h b/libjava/javax/accessibility/AccessibleSelection.h
deleted file mode 100644
index 3ab7b44948f..00000000000
--- a/libjava/javax/accessibility/AccessibleSelection.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleSelection__
-#define __javax_accessibility_AccessibleSelection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleSelection;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleSelection : public ::java::lang::Object
-{
-
-public:
-  virtual jint getAccessibleSelectionCount() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint) = 0;
-  virtual jboolean isAccessibleChildSelected(jint) = 0;
-  virtual void addAccessibleSelection(jint) = 0;
-  virtual void removeAccessibleSelection(jint) = 0;
-  virtual void clearAccessibleSelection() = 0;
-  virtual void selectAllAccessibleSelection() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleSelection__
diff --git a/libjava/javax/accessibility/AccessibleState.h b/libjava/javax/accessibility/AccessibleState.h
deleted file mode 100644
index 3bc1adfe6b5..00000000000
--- a/libjava/javax/accessibility/AccessibleState.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleState__
-#define __javax_accessibility_AccessibleState__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleBundle.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleState;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleState : public ::javax::accessibility::AccessibleBundle
-{
-
-public: // actually protected
-  AccessibleState(::java::lang::String *);
-public:
-  static ::javax::accessibility::AccessibleState * ACTIVE;
-  static ::javax::accessibility::AccessibleState * PRESSED;
-  static ::javax::accessibility::AccessibleState * ARMED;
-  static ::javax::accessibility::AccessibleState * BUSY;
-  static ::javax::accessibility::AccessibleState * CHECKED;
-  static ::javax::accessibility::AccessibleState * EDITABLE;
-  static ::javax::accessibility::AccessibleState * EXPANDABLE;
-  static ::javax::accessibility::AccessibleState * COLLAPSED;
-  static ::javax::accessibility::AccessibleState * EXPANDED;
-  static ::javax::accessibility::AccessibleState * ENABLED;
-  static ::javax::accessibility::AccessibleState * FOCUSABLE;
-  static ::javax::accessibility::AccessibleState * FOCUSED;
-  static ::javax::accessibility::AccessibleState * ICONIFIED;
-  static ::javax::accessibility::AccessibleState * INDETERMINATE;
-  static ::javax::accessibility::AccessibleState * MANAGES_DESCENDANTS;
-  static ::javax::accessibility::AccessibleState * MODAL;
-  static ::javax::accessibility::AccessibleState * OPAQUE;
-  static ::javax::accessibility::AccessibleState * RESIZABLE;
-  static ::javax::accessibility::AccessibleState * MULTISELECTABLE;
-  static ::javax::accessibility::AccessibleState * SELECTABLE;
-  static ::javax::accessibility::AccessibleState * SELECTED;
-  static ::javax::accessibility::AccessibleState * SHOWING;
-  static ::javax::accessibility::AccessibleState * TRUNCATED;
-  static ::javax::accessibility::AccessibleState * VISIBLE;
-  static ::javax::accessibility::AccessibleState * VERTICAL;
-  static ::javax::accessibility::AccessibleState * HORIZONTAL;
-  static ::javax::accessibility::AccessibleState * SINGLE_LINE;
-  static ::javax::accessibility::AccessibleState * MULTI_LINE;
-  static ::javax::accessibility::AccessibleState * TRANSIENT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleState__
diff --git a/libjava/javax/accessibility/AccessibleStateSet.h b/libjava/javax/accessibility/AccessibleStateSet.h
deleted file mode 100644
index cf34e3aed03..00000000000
--- a/libjava/javax/accessibility/AccessibleStateSet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleStateSet__
-#define __javax_accessibility_AccessibleStateSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleState;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleStateSet : public ::java::lang::Object
-{
-
-public:
-  AccessibleStateSet();
-  AccessibleStateSet(JArray< ::javax::accessibility::AccessibleState * > *);
-  virtual jboolean add(::javax::accessibility::AccessibleState *);
-  virtual void addAll(JArray< ::javax::accessibility::AccessibleState * > *);
-  virtual jboolean remove(::javax::accessibility::AccessibleState *);
-  virtual void clear();
-  virtual jboolean contains(::javax::accessibility::AccessibleState *);
-  virtual JArray< ::javax::accessibility::AccessibleState * > * toArray();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) states;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleStateSet__
diff --git a/libjava/javax/accessibility/AccessibleStreamable.h b/libjava/javax/accessibility/AccessibleStreamable.h
deleted file mode 100644
index ed0e5ab1d43..00000000000
--- a/libjava/javax/accessibility/AccessibleStreamable.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleStreamable__
-#define __javax_accessibility_AccessibleStreamable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStreamable;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleStreamable : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getMimeTypes() = 0;
-  virtual ::java::io::InputStream * getStream(::java::awt::datatransfer::DataFlavor *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleStreamable__
diff --git a/libjava/javax/accessibility/AccessibleTable.h b/libjava/javax/accessibility/AccessibleTable.h
deleted file mode 100644
index 0c3531bbcb5..00000000000
--- a/libjava/javax/accessibility/AccessibleTable.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleTable__
-#define __javax_accessibility_AccessibleTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleTable;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleTable : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::accessibility::Accessible * getAccessibleCaption() = 0;
-  virtual void setAccessibleCaption(::javax::accessibility::Accessible *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleSummary() = 0;
-  virtual void setAccessibleSummary(::javax::accessibility::Accessible *) = 0;
-  virtual jint getAccessibleRowCount() = 0;
-  virtual jint getAccessibleColumnCount() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint) = 0;
-  virtual jint getAccessibleRowExtentAt(jint, jint) = 0;
-  virtual jint getAccessibleColumnExtentAt(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader() = 0;
-  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *) = 0;
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader() = 0;
-  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint) = 0;
-  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint) = 0;
-  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *) = 0;
-  virtual jboolean isAccessibleSelected(jint, jint) = 0;
-  virtual jboolean isAccessibleRowSelected(jint) = 0;
-  virtual jboolean isAccessibleColumnSelected(jint) = 0;
-  virtual JArray< jint > * getSelectedAccessibleRows() = 0;
-  virtual JArray< jint > * getSelectedAccessibleColumns() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleTable__
diff --git a/libjava/javax/accessibility/AccessibleTableModelChange.h b/libjava/javax/accessibility/AccessibleTableModelChange.h
deleted file mode 100644
index f3dc58b4e84..00000000000
--- a/libjava/javax/accessibility/AccessibleTableModelChange.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleTableModelChange__
-#define __javax_accessibility_AccessibleTableModelChange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleTableModelChange;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleTableModelChange : public ::java::lang::Object
-{
-
-public:
-  virtual jint getType() = 0;
-  virtual jint getFirstRow() = 0;
-  virtual jint getLastRow() = 0;
-  virtual jint getFirstColumn() = 0;
-  virtual jint getLastColumn() = 0;
-  static const jint INSERT = 1;
-  static const jint UPDATE = 0;
-  static const jint DELETE = -1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleTableModelChange__
diff --git a/libjava/javax/accessibility/AccessibleText.h b/libjava/javax/accessibility/AccessibleText.h
deleted file mode 100644
index f6ccf87c0ce..00000000000
--- a/libjava/javax/accessibility/AccessibleText.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleText__
-#define __javax_accessibility_AccessibleText__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleText;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::accessibility::AccessibleText : public ::java::lang::Object
-{
-
-public:
-  virtual jint getIndexAtPoint(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jint getCharCount() = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual ::java::lang::String * getAtIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getAfterIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getBeforeIndex(jint, jint) = 0;
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint) = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual ::java::lang::String * getSelectedText() = 0;
-  static const jint CHARACTER = 1;
-  static const jint WORD = 2;
-  static const jint SENTENCE = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleText__
diff --git a/libjava/javax/accessibility/AccessibleTextSequence.h b/libjava/javax/accessibility/AccessibleTextSequence.h
deleted file mode 100644
index 280ad30886f..00000000000
--- a/libjava/javax/accessibility/AccessibleTextSequence.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleTextSequence__
-#define __javax_accessibility_AccessibleTextSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleTextSequence;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleTextSequence : public ::java::lang::Object
-{
-
-public:
-  AccessibleTextSequence(jint, jint, ::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
-  jint startIndex;
-  jint endIndex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleTextSequence__
diff --git a/libjava/javax/accessibility/AccessibleValue.h b/libjava/javax/accessibility/AccessibleValue.h
deleted file mode 100644
index a82754ad412..00000000000
--- a/libjava/javax/accessibility/AccessibleValue.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleValue__
-#define __javax_accessibility_AccessibleValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleValue;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Number * getCurrentAccessibleValue() = 0;
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *) = 0;
-  virtual ::java::lang::Number * getMinimumAccessibleValue() = 0;
-  virtual ::java::lang::Number * getMaximumAccessibleValue() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleValue__
diff --git a/libjava/javax/activation/ActivationDataFlavor.h b/libjava/javax/activation/ActivationDataFlavor.h
deleted file mode 100644
index 0b8308b3188..00000000000
--- a/libjava/javax/activation/ActivationDataFlavor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_ActivationDataFlavor__
-#define __javax_activation_ActivationDataFlavor__
-
-#pragma interface
-
-#include <java/awt/datatransfer/DataFlavor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class ActivationDataFlavor;
-    }
-  }
-}
-
-class javax::activation::ActivationDataFlavor : public ::java::awt::datatransfer::DataFlavor
-{
-
-public:
-  ActivationDataFlavor(::java::lang::Class *, ::java::lang::String *, ::java::lang::String *);
-  ActivationDataFlavor(::java::lang::Class *, ::java::lang::String *);
-  ActivationDataFlavor(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getMimeType();
-  virtual ::java::lang::Class * getRepresentationClass();
-  virtual ::java::lang::String * getHumanPresentableName();
-  virtual void setHumanPresentableName(::java::lang::String *);
-  virtual jboolean equals(::java::awt::datatransfer::DataFlavor *);
-  virtual jboolean isMimeTypeEqual(::java::lang::String *);
-public: // actually protected
-  virtual ::java::lang::String * normalizeMimeTypeParameter(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * normalizeMimeType(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::datatransfer::DataFlavor)))) mimeType;
-  ::java::lang::Class * representationClass;
-  ::java::lang::String * humanPresentableName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_ActivationDataFlavor__
diff --git a/libjava/javax/activation/CommandInfo.h b/libjava/javax/activation/CommandInfo.h
deleted file mode 100644
index 19beeccd857..00000000000
--- a/libjava/javax/activation/CommandInfo.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_CommandInfo__
-#define __javax_activation_CommandInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class CommandInfo;
-        class DataHandler;
-    }
-  }
-}
-
-class javax::activation::CommandInfo : public ::java::lang::Object
-{
-
-public:
-  CommandInfo(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getCommandName();
-  virtual ::java::lang::String * getCommandClass();
-  virtual ::java::lang::Object * getCommandObject(::javax::activation::DataHandler *, ::java::lang::ClassLoader *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) verb;
-  ::java::lang::String * className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_CommandInfo__
diff --git a/libjava/javax/activation/CommandMap.h b/libjava/javax/activation/CommandMap.h
deleted file mode 100644
index 5f0f963feb1..00000000000
--- a/libjava/javax/activation/CommandMap.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_CommandMap__
-#define __javax_activation_CommandMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class CommandInfo;
-        class CommandMap;
-        class DataContentHandler;
-        class DataSource;
-    }
-  }
-}
-
-class javax::activation::CommandMap : public ::java::lang::Object
-{
-
-public:
-  CommandMap();
-  static ::javax::activation::CommandMap * getDefaultCommandMap();
-  static void setDefaultCommandMap(::javax::activation::CommandMap *);
-  virtual JArray< ::javax::activation::CommandInfo * > * getPreferredCommands(::java::lang::String *) = 0;
-  virtual JArray< ::javax::activation::CommandInfo * > * getAllCommands(::java::lang::String *) = 0;
-  virtual ::javax::activation::CommandInfo * getCommand(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::activation::DataContentHandler * createDataContentHandler(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getMimeTypes();
-  virtual JArray< ::javax::activation::CommandInfo * > * getPreferredCommands(::java::lang::String *, ::javax::activation::DataSource *);
-  virtual JArray< ::javax::activation::CommandInfo * > * getAllCommands(::java::lang::String *, ::javax::activation::DataSource *);
-  virtual ::javax::activation::CommandInfo * getCommand(::java::lang::String *, ::java::lang::String *, ::javax::activation::DataSource *);
-  virtual ::javax::activation::DataContentHandler * createDataContentHandler(::java::lang::String *, ::javax::activation::DataSource *);
-private:
-  static ::javax::activation::CommandMap * defaultCommandMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_CommandMap__
diff --git a/libjava/javax/activation/CommandObject.h b/libjava/javax/activation/CommandObject.h
deleted file mode 100644
index 945e35af08f..00000000000
--- a/libjava/javax/activation/CommandObject.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_CommandObject__
-#define __javax_activation_CommandObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class CommandObject;
-        class DataHandler;
-    }
-  }
-}
-
-class javax::activation::CommandObject : public ::java::lang::Object
-{
-
-public:
-  virtual void setCommandContext(::java::lang::String *, ::javax::activation::DataHandler *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_activation_CommandObject__
diff --git a/libjava/javax/activation/DataContentHandler.h b/libjava/javax/activation/DataContentHandler.h
deleted file mode 100644
index 9fac4814662..00000000000
--- a/libjava/javax/activation/DataContentHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_DataContentHandler__
-#define __javax_activation_DataContentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataContentHandler;
-        class DataSource;
-    }
-  }
-}
-
-class javax::activation::DataContentHandler : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors() = 0;
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *, ::javax::activation::DataSource *) = 0;
-  virtual ::java::lang::Object * getContent(::javax::activation::DataSource *) = 0;
-  virtual void writeTo(::java::lang::Object *, ::java::lang::String *, ::java::io::OutputStream *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_activation_DataContentHandler__
diff --git a/libjava/javax/activation/DataContentHandlerFactory.h b/libjava/javax/activation/DataContentHandlerFactory.h
deleted file mode 100644
index 2e22a4e3e57..00000000000
--- a/libjava/javax/activation/DataContentHandlerFactory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_DataContentHandlerFactory__
-#define __javax_activation_DataContentHandlerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataContentHandler;
-        class DataContentHandlerFactory;
-    }
-  }
-}
-
-class javax::activation::DataContentHandlerFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::activation::DataContentHandler * createDataContentHandler(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_activation_DataContentHandlerFactory__
diff --git a/libjava/javax/activation/DataHandler$DataContentHandlerWriter.h b/libjava/javax/activation/DataHandler$DataContentHandlerWriter.h
deleted file mode 100644
index 5d4aedf5311..00000000000
--- a/libjava/javax/activation/DataHandler$DataContentHandlerWriter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_DataHandler$DataContentHandlerWriter__
-#define __javax_activation_DataHandler$DataContentHandlerWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataContentHandler;
-        class DataHandler$DataContentHandlerWriter;
-    }
-  }
-}
-
-class javax::activation::DataHandler$DataContentHandlerWriter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DataHandler$DataContentHandlerWriter(::javax::activation::DataContentHandler *, ::java::lang::Object *, ::java::lang::String *, ::java::io::OutputStream *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::activation::DataContentHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dch;
-  ::java::lang::Object * object;
-  ::java::lang::String * mimeType;
-  ::java::io::OutputStream * out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_DataHandler$DataContentHandlerWriter__
diff --git a/libjava/javax/activation/DataHandler.h b/libjava/javax/activation/DataHandler.h
deleted file mode 100644
index 034bdc14300..00000000000
--- a/libjava/javax/activation/DataHandler.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_DataHandler__
-#define __javax_activation_DataHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class CommandInfo;
-        class CommandMap;
-        class DataContentHandler;
-        class DataContentHandlerFactory;
-        class DataHandler;
-        class DataSource;
-    }
-  }
-}
-
-class javax::activation::DataHandler : public ::java::lang::Object
-{
-
-public:
-  DataHandler(::javax::activation::DataSource *);
-  DataHandler(::java::lang::Object *, ::java::lang::String *);
-  DataHandler(::java::net::URL *);
-  virtual ::javax::activation::DataSource * getDataSource();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getContentType();
-  virtual ::java::io::InputStream * getInputStream();
-  virtual void writeTo(::java::io::OutputStream *);
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
-  virtual void setCommandMap(::javax::activation::CommandMap *);
-  virtual JArray< ::javax::activation::CommandInfo * > * getPreferredCommands();
-  virtual JArray< ::javax::activation::CommandInfo * > * getAllCommands();
-  virtual ::javax::activation::CommandInfo * getCommand(::java::lang::String *);
-  virtual ::java::lang::Object * getContent();
-  virtual ::java::lang::Object * getBean(::javax::activation::CommandInfo *);
-  static void setDataContentHandlerFactory(::javax::activation::DataContentHandlerFactory *);
-private:
-  ::java::lang::String * getShortType();
-  ::javax::activation::CommandMap * getCommandMap();
-  ::javax::activation::DataContentHandler * getDataContentHandler();
-  static JArray< ::java::awt::datatransfer::DataFlavor * > * NO_FLAVORS;
-  static ::javax::activation::DataContentHandlerFactory * factory;
-  ::javax::activation::DataSource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dataSource;
-  ::javax::activation::DataSource * objDataSource;
-  ::java::lang::Object * object;
-  ::java::lang::String * objectMimeType;
-  ::javax::activation::CommandMap * currentCommandMap;
-  JArray< ::java::awt::datatransfer::DataFlavor * > * transferFlavors;
-  ::javax::activation::DataContentHandler * dataContentHandler;
-  ::javax::activation::DataContentHandler * factoryDCH;
-  ::javax::activation::DataContentHandlerFactory * oldFactory;
-  ::java::lang::String * shortType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_DataHandler__
diff --git a/libjava/javax/activation/DataHandlerDataSource.h b/libjava/javax/activation/DataHandlerDataSource.h
deleted file mode 100644
index feae6e3015c..00000000000
--- a/libjava/javax/activation/DataHandlerDataSource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_DataHandlerDataSource__
-#define __javax_activation_DataHandlerDataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataHandler;
-        class DataHandlerDataSource;
-    }
-  }
-}
-
-class javax::activation::DataHandlerDataSource : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DataHandlerDataSource(::javax::activation::DataHandler *);
-public:
-  ::java::lang::String * getContentType();
-  ::java::io::InputStream * getInputStream();
-  ::java::lang::String * getName();
-  ::java::io::OutputStream * getOutputStream();
-public: // actually package-private
-  ::javax::activation::DataHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dh;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_DataHandlerDataSource__
diff --git a/libjava/javax/activation/DataSource.h b/libjava/javax/activation/DataSource.h
deleted file mode 100644
index eb493aab630..00000000000
--- a/libjava/javax/activation/DataSource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_DataSource__
-#define __javax_activation_DataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataSource;
-    }
-  }
-}
-
-class javax::activation::DataSource : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::io::InputStream * getInputStream() = 0;
-  virtual ::java::io::OutputStream * getOutputStream() = 0;
-  virtual ::java::lang::String * getContentType() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_activation_DataSource__
diff --git a/libjava/javax/activation/DataSourceDataContentHandler.h b/libjava/javax/activation/DataSourceDataContentHandler.h
deleted file mode 100644
index e364878e8cd..00000000000
--- a/libjava/javax/activation/DataSourceDataContentHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_DataSourceDataContentHandler__
-#define __javax_activation_DataSourceDataContentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataContentHandler;
-        class DataSource;
-        class DataSourceDataContentHandler;
-    }
-  }
-}
-
-class javax::activation::DataSourceDataContentHandler : public ::java::lang::Object
-{
-
-public:
-  DataSourceDataContentHandler(::javax::activation::DataContentHandler *, ::javax::activation::DataSource *);
-  virtual ::java::lang::Object * getContent(::javax::activation::DataSource *);
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *, ::javax::activation::DataSource *);
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual void writeTo(::java::lang::Object *, ::java::lang::String *, ::java::io::OutputStream *);
-private:
-  ::javax::activation::DataSource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ds;
-  JArray< ::java::awt::datatransfer::DataFlavor * > * flavors;
-  ::javax::activation::DataContentHandler * dch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_DataSourceDataContentHandler__
diff --git a/libjava/javax/activation/FileDataSource.h b/libjava/javax/activation/FileDataSource.h
deleted file mode 100644
index a3636b8a0ce..00000000000
--- a/libjava/javax/activation/FileDataSource.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_FileDataSource__
-#define __javax_activation_FileDataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class FileDataSource;
-        class FileTypeMap;
-    }
-  }
-}
-
-class javax::activation::FileDataSource : public ::java::lang::Object
-{
-
-public:
-  FileDataSource(::java::io::File *);
-  FileDataSource(::java::lang::String *);
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual ::java::lang::String * getContentType();
-  virtual ::java::lang::String * getName();
-  virtual ::java::io::File * getFile();
-  virtual void setFileTypeMap(::javax::activation::FileTypeMap *);
-private:
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::lang::Object)))) file;
-  ::javax::activation::FileTypeMap * typeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_FileDataSource__
diff --git a/libjava/javax/activation/FileTypeMap.h b/libjava/javax/activation/FileTypeMap.h
deleted file mode 100644
index e141b375469..00000000000
--- a/libjava/javax/activation/FileTypeMap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_FileTypeMap__
-#define __javax_activation_FileTypeMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class FileTypeMap;
-    }
-  }
-}
-
-class javax::activation::FileTypeMap : public ::java::lang::Object
-{
-
-public:
-  FileTypeMap();
-  static ::javax::activation::FileTypeMap * getDefaultFileTypeMap();
-  static void setDefaultFileTypeMap(::javax::activation::FileTypeMap *);
-  virtual ::java::lang::String * getContentType(::java::io::File *) = 0;
-  virtual ::java::lang::String * getContentType(::java::lang::String *) = 0;
-private:
-  static ::javax::activation::FileTypeMap * defaultMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_FileTypeMap__
diff --git a/libjava/javax/activation/MailcapCommandMap.h b/libjava/javax/activation/MailcapCommandMap.h
deleted file mode 100644
index bf5c28fcb85..00000000000
--- a/libjava/javax/activation/MailcapCommandMap.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_MailcapCommandMap__
-#define __javax_activation_MailcapCommandMap__
-
-#pragma interface
-
-#include <javax/activation/CommandMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class CommandInfo;
-        class DataContentHandler;
-        class MailcapCommandMap;
-    }
-  }
-}
-
-class javax::activation::MailcapCommandMap : public ::javax::activation::CommandMap
-{
-
-public:
-  MailcapCommandMap();
-  MailcapCommandMap(::java::lang::String *);
-  MailcapCommandMap(::java::io::InputStream *);
-private:
-  void init(::java::io::Reader *);
-public:
-  virtual JArray< ::javax::activation::CommandInfo * > * getPreferredCommands(::java::lang::String *);
-  virtual JArray< ::javax::activation::CommandInfo * > * getAllCommands(::java::lang::String *);
-  virtual ::javax::activation::CommandInfo * getCommand(::java::lang::String *, ::java::lang::String *);
-  virtual void addMailcap(::java::lang::String *);
-  virtual ::javax::activation::DataContentHandler * createDataContentHandler(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getNativeCommands(::java::lang::String *);
-private:
-  void addNativeCommands(::java::util::List *, ::java::util::Map *, ::java::lang::String *);
-  static ::java::lang::String * nameOf(jint);
-  void parseFile(jint, ::java::lang::String *);
-  void parseResource(jint, ::java::lang::String *);
-  void parse(jint, ::java::io::Reader *);
-  void parseEntry(jint, ::java::lang::String *);
-  void addField(::java::util::Map *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ::java::util::Map * getCommands(::java::util::Map *, ::java::lang::String *);
-  ::java::util::List * getSystemResources(::java::lang::String *);
-  static const jint PROG = 0;
-  static const jint HOME = 1;
-  static const jint SYS = 2;
-  static const jint JAR = 3;
-  static const jint DEF = 4;
-  static jboolean debug;
-  static const jint NORMAL = 0;
-  static const jint FALLBACK = 1;
-  JArray< JArray< ::java::util::Map * > * > * __attribute__((aligned(__alignof__( ::javax::activation::CommandMap)))) mailcaps;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_MailcapCommandMap__
diff --git a/libjava/javax/activation/MimeType.h b/libjava/javax/activation/MimeType.h
deleted file mode 100644
index a6dbb1eece4..00000000000
--- a/libjava/javax/activation/MimeType.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_MimeType__
-#define __javax_activation_MimeType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class MimeType;
-        class MimeTypeParameterList;
-    }
-  }
-}
-
-class javax::activation::MimeType : public ::java::lang::Object
-{
-
-public:
-  MimeType();
-  MimeType(::java::lang::String *);
-  MimeType(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getPrimaryType();
-  virtual void setPrimaryType(::java::lang::String *);
-  virtual ::java::lang::String * getSubType();
-  virtual void setSubType(::java::lang::String *);
-  virtual ::javax::activation::MimeTypeParameterList * getParameters();
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual void setParameter(::java::lang::String *, ::java::lang::String *);
-  virtual void removeParameter(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * getBaseType();
-  virtual jboolean match(::javax::activation::MimeType *);
-  virtual jboolean match(::java::lang::String *);
-  virtual void writeExternal(::java::io::ObjectOutput *);
-  virtual void readExternal(::java::io::ObjectInput *);
-private:
-  void parse(::java::lang::String *);
-public: // actually package-private
-  static void checkValidity(::java::lang::String *, ::java::lang::String *);
-  static jboolean isValidChar(jchar);
-  static ::java::lang::String * TSPECIALS;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) primaryType;
-  ::java::lang::String * subType;
-  ::javax::activation::MimeTypeParameterList * parameters;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_MimeType__
diff --git a/libjava/javax/activation/MimeTypeParameterList$IteratorEnumeration.h b/libjava/javax/activation/MimeTypeParameterList$IteratorEnumeration.h
deleted file mode 100644
index 4106522f97a..00000000000
--- a/libjava/javax/activation/MimeTypeParameterList$IteratorEnumeration.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_MimeTypeParameterList$IteratorEnumeration__
-#define __javax_activation_MimeTypeParameterList$IteratorEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class MimeTypeParameterList$IteratorEnumeration;
-    }
-  }
-}
-
-class javax::activation::MimeTypeParameterList$IteratorEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MimeTypeParameterList$IteratorEnumeration(::java::util::Iterator *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::String * MimeTypeParameterList$IteratorEnumeration$nextElement();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_MimeTypeParameterList$IteratorEnumeration__
diff --git a/libjava/javax/activation/MimeTypeParameterList.h b/libjava/javax/activation/MimeTypeParameterList.h
deleted file mode 100644
index 06bfca93470..00000000000
--- a/libjava/javax/activation/MimeTypeParameterList.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_MimeTypeParameterList__
-#define __javax_activation_MimeTypeParameterList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class MimeTypeParameterList;
-    }
-  }
-}
-
-class javax::activation::MimeTypeParameterList : public ::java::lang::Object
-{
-
-public:
-  MimeTypeParameterList();
-  MimeTypeParameterList(::java::lang::String *);
-public: // actually protected
-  virtual void parse(::java::lang::String *);
-public:
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual ::java::lang::String * get(::java::lang::String *);
-  virtual void set(::java::lang::String *, ::java::lang::String *);
-  virtual void remove(::java::lang::String *);
-  virtual ::java::util::Enumeration * getNames();
-  virtual ::java::lang::String * toString();
-private:
-  static ::java::lang::String * quote(::java::lang::String *);
-  static ::java::lang::String * unquote(::java::lang::String *);
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parameterNames;
-  ::java::util::Map * parameterValues;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_MimeTypeParameterList__
diff --git a/libjava/javax/activation/MimeTypeParseException.h b/libjava/javax/activation/MimeTypeParseException.h
deleted file mode 100644
index e94e3134dcf..00000000000
--- a/libjava/javax/activation/MimeTypeParseException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_MimeTypeParseException__
-#define __javax_activation_MimeTypeParseException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class MimeTypeParseException;
-    }
-  }
-}
-
-class javax::activation::MimeTypeParseException : public ::java::lang::Exception
-{
-
-public:
-  MimeTypeParseException();
-  MimeTypeParseException(::java::lang::String *);
-public: // actually package-private
-  MimeTypeParseException(::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_MimeTypeParseException__
diff --git a/libjava/javax/activation/MimetypesFileTypeMap.h b/libjava/javax/activation/MimetypesFileTypeMap.h
deleted file mode 100644
index 78ab939b780..00000000000
--- a/libjava/javax/activation/MimetypesFileTypeMap.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_MimetypesFileTypeMap__
-#define __javax_activation_MimetypesFileTypeMap__
-
-#pragma interface
-
-#include <javax/activation/FileTypeMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class MimetypesFileTypeMap;
-    }
-  }
-}
-
-class javax::activation::MimetypesFileTypeMap : public ::javax::activation::FileTypeMap
-{
-
-public:
-  MimetypesFileTypeMap();
-  MimetypesFileTypeMap(::java::lang::String *);
-  MimetypesFileTypeMap(::java::io::InputStream *);
-private:
-  void init(::java::io::Reader *);
-public:
-  virtual void addMimeTypes(::java::lang::String *);
-  virtual ::java::lang::String * getContentType(::java::io::File *);
-  virtual ::java::lang::String * getContentType(::java::lang::String *);
-private:
-  void parseFile(::java::util::Map *, ::java::lang::String *);
-  void parseResource(::java::util::Map *, ::java::lang::String *);
-  void parse(::java::util::Map *, ::java::io::Reader *);
-  void parseEntry(::java::util::Map *, ::java::lang::String *);
-  ::java::util::List * getSystemResources(::java::lang::String *);
-  static const jint PROG = 0;
-  static const jint HOME = 1;
-  static const jint SYS = 2;
-  static const jint JAR = 3;
-  static const jint DEF = 4;
-  static ::java::lang::String * DEFAULT_MIME_TYPE;
-  static jboolean debug;
-  JArray< ::java::util::Map * > * __attribute__((aligned(__alignof__( ::javax::activation::FileTypeMap)))) mimetypes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_MimetypesFileTypeMap__
diff --git a/libjava/javax/activation/ObjectDataContentHandler.h b/libjava/javax/activation/ObjectDataContentHandler.h
deleted file mode 100644
index 74a73db60fc..00000000000
--- a/libjava/javax/activation/ObjectDataContentHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_ObjectDataContentHandler__
-#define __javax_activation_ObjectDataContentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class DataContentHandler;
-        class DataSource;
-        class ObjectDataContentHandler;
-    }
-  }
-}
-
-class javax::activation::ObjectDataContentHandler : public ::java::lang::Object
-{
-
-public:
-  ObjectDataContentHandler(::javax::activation::DataContentHandler *, ::java::lang::Object *, ::java::lang::String *);
-  virtual ::java::lang::Object * getContent(::javax::activation::DataSource *);
-  virtual ::javax::activation::DataContentHandler * getDCH();
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *, ::javax::activation::DataSource *);
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual void writeTo(::java::lang::Object *, ::java::lang::String *, ::java::io::OutputStream *);
-private:
-  ::javax::activation::DataContentHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dch;
-  ::java::lang::Object * object;
-  ::java::lang::String * mimeType;
-  JArray< ::java::awt::datatransfer::DataFlavor * > * flavors;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_ObjectDataContentHandler__
diff --git a/libjava/javax/activation/URLDataSource.h b/libjava/javax/activation/URLDataSource.h
deleted file mode 100644
index 30fa6a1fa04..00000000000
--- a/libjava/javax/activation/URLDataSource.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_URLDataSource__
-#define __javax_activation_URLDataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-  namespace javax
-  {
-    namespace activation
-    {
-        class URLDataSource;
-    }
-  }
-}
-
-class javax::activation::URLDataSource : public ::java::lang::Object
-{
-
-public:
-  URLDataSource(::java::net::URL *);
-  virtual ::java::lang::String * getContentType();
-  virtual ::java::lang::String * getName();
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual ::java::net::URL * getURL();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) url;
-  ::java::net::URLConnection * connection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_URLDataSource__
diff --git a/libjava/javax/activation/UnsupportedDataTypeException.h b/libjava/javax/activation/UnsupportedDataTypeException.h
deleted file mode 100644
index c0803f561a9..00000000000
--- a/libjava/javax/activation/UnsupportedDataTypeException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activation_UnsupportedDataTypeException__
-#define __javax_activation_UnsupportedDataTypeException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activation
-    {
-        class UnsupportedDataTypeException;
-    }
-  }
-}
-
-class javax::activation::UnsupportedDataTypeException : public ::java::io::IOException
-{
-
-public:
-  UnsupportedDataTypeException();
-  UnsupportedDataTypeException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activation_UnsupportedDataTypeException__
diff --git a/libjava/javax/activity/ActivityCompletedException.h b/libjava/javax/activity/ActivityCompletedException.h
deleted file mode 100644
index b7508118ad0..00000000000
--- a/libjava/javax/activity/ActivityCompletedException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activity_ActivityCompletedException__
-#define __javax_activity_ActivityCompletedException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activity
-    {
-        class ActivityCompletedException;
-    }
-  }
-}
-
-class javax::activity::ActivityCompletedException : public ::java::rmi::RemoteException
-{
-
-public:
-  ActivityCompletedException();
-  ActivityCompletedException(::java::lang::String *);
-  ActivityCompletedException(::java::lang::Throwable *);
-  ActivityCompletedException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activity_ActivityCompletedException__
diff --git a/libjava/javax/activity/ActivityRequiredException.h b/libjava/javax/activity/ActivityRequiredException.h
deleted file mode 100644
index 93c10f5f934..00000000000
--- a/libjava/javax/activity/ActivityRequiredException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activity_ActivityRequiredException__
-#define __javax_activity_ActivityRequiredException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activity
-    {
-        class ActivityRequiredException;
-    }
-  }
-}
-
-class javax::activity::ActivityRequiredException : public ::java::rmi::RemoteException
-{
-
-public:
-  ActivityRequiredException();
-  ActivityRequiredException(::java::lang::String *);
-  ActivityRequiredException(::java::lang::Throwable *);
-  ActivityRequiredException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activity_ActivityRequiredException__
diff --git a/libjava/javax/activity/InvalidActivityException.h b/libjava/javax/activity/InvalidActivityException.h
deleted file mode 100644
index 930192bcd8d..00000000000
--- a/libjava/javax/activity/InvalidActivityException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_activity_InvalidActivityException__
-#define __javax_activity_InvalidActivityException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace activity
-    {
-        class InvalidActivityException;
-    }
-  }
-}
-
-class javax::activity::InvalidActivityException : public ::java::rmi::RemoteException
-{
-
-public:
-  InvalidActivityException();
-  InvalidActivityException(::java::lang::String *);
-  InvalidActivityException(::java::lang::Throwable *);
-  InvalidActivityException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_activity_InvalidActivityException__
diff --git a/libjava/javax/crypto/BadPaddingException.h b/libjava/javax/crypto/BadPaddingException.h
deleted file mode 100644
index 201d4a06ffb..00000000000
--- a/libjava/javax/crypto/BadPaddingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_BadPaddingException__
-#define __javax_crypto_BadPaddingException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class BadPaddingException;
-    }
-  }
-}
-
-class javax::crypto::BadPaddingException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  BadPaddingException();
-  BadPaddingException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5315033893984728443LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_BadPaddingException__
diff --git a/libjava/javax/crypto/Cipher.h b/libjava/javax/crypto/Cipher.h
deleted file mode 100644
index b77c4d1d959..00000000000
--- a/libjava/javax/crypto/Cipher.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_Cipher__
-#define __javax_crypto_Cipher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class Provider;
-        class SecureRandom;
-      namespace cert
-      {
-          class Certificate;
-      }
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class CipherSpi;
-        class ExemptionMechanism;
-    }
-  }
-}
-
-class javax::crypto::Cipher : public ::java::lang::Object
-{
-
-public:
-  static ::javax::crypto::Cipher * getInstance(::java::lang::String *);
-  static ::javax::crypto::Cipher * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::Cipher * getInstance(::java::lang::String *, ::java::security::Provider *);
-public: // actually protected
-  Cipher(::javax::crypto::CipherSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual jint getBlockSize();
-  virtual ::javax::crypto::ExemptionMechanism * getExemptionMechanism();
-  virtual JArray< jbyte > * getIV();
-  virtual ::java::security::AlgorithmParameters * getParameters();
-  virtual ::java::security::Provider * getProvider();
-  virtual JArray< jbyte > * doFinal();
-  virtual JArray< jbyte > * doFinal(JArray< jbyte > *);
-  virtual JArray< jbyte > * doFinal(JArray< jbyte > *, jint, jint);
-  virtual jint doFinal(JArray< jbyte > *, jint);
-  virtual jint doFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual jint doFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *);
-  virtual jint doFinal(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual jint getOutputSize(jint);
-  virtual void init(jint, ::java::security::cert::Certificate *);
-  virtual void init(jint, ::java::security::Key *);
-  virtual void init(jint, ::java::security::cert::Certificate *, ::java::security::SecureRandom *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::Key * unwrap(JArray< jbyte > *, ::java::lang::String *, jint);
-  virtual JArray< jbyte > * update(JArray< jbyte > *);
-  virtual JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
-  virtual jint update(JArray< jbyte > *, jint, jint, JArray< jbyte > *);
-  virtual jint update(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual jint update(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * wrap(::java::security::Key *);
-private:
-  static ::java::lang::String * SERVICE;
-public:
-  static const jint DECRYPT_MODE = 2;
-  static const jint ENCRYPT_MODE = 1;
-  static const jint PRIVATE_KEY = 2;
-  static const jint PUBLIC_KEY = 1;
-  static const jint SECRET_KEY = 3;
-  static const jint UNWRAP_MODE = 4;
-  static const jint WRAP_MODE = 3;
-private:
-  static const jint INITIAL_STATE = 0;
-  ::javax::crypto::CipherSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipherSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * transformation;
-  jint state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_Cipher__
diff --git a/libjava/javax/crypto/CipherInputStream.h b/libjava/javax/crypto/CipherInputStream.h
deleted file mode 100644
index e4c16e17375..00000000000
--- a/libjava/javax/crypto/CipherInputStream.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_CipherInputStream__
-#define __javax_crypto_CipherInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class CipherInputStream;
-    }
-  }
-}
-
-class javax::crypto::CipherInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  CipherInputStream(::java::io::InputStream *, ::javax::crypto::Cipher *);
-public: // actually protected
-  CipherInputStream(::java::io::InputStream *);
-public:
-  virtual jint available();
-  virtual void close();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-  virtual jlong skip(jlong);
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-private:
-  void nextBlock();
-  static ::java::util::logging::Logger * logger;
-  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) cipher;
-  JArray< jbyte > * outBuffer;
-  jint outOffset;
-  jboolean isStream;
-  jboolean eof;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_CipherInputStream__
diff --git a/libjava/javax/crypto/CipherOutputStream.h b/libjava/javax/crypto/CipherOutputStream.h
deleted file mode 100644
index 59da0000719..00000000000
--- a/libjava/javax/crypto/CipherOutputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_CipherOutputStream__
-#define __javax_crypto_CipherOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class CipherOutputStream;
-    }
-  }
-}
-
-class javax::crypto::CipherOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  CipherOutputStream(::java::io::OutputStream *, ::javax::crypto::Cipher *);
-public: // actually protected
-  CipherOutputStream(::java::io::OutputStream *);
-public:
-  virtual void close();
-  virtual void flush();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) cipher;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_CipherOutputStream__
diff --git a/libjava/javax/crypto/CipherSpi.h b/libjava/javax/crypto/CipherSpi.h
deleted file mode 100644
index dd79290401f..00000000000
--- a/libjava/javax/crypto/CipherSpi.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_CipherSpi__
-#define __javax_crypto_CipherSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class CipherSpi;
-    }
-  }
-}
-
-class javax::crypto::CipherSpi : public ::java::lang::Object
-{
-
-public:
-  CipherSpi();
-public: // actually protected
-  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
-  virtual jint engineDoFinal(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual jint engineGetBlockSize() = 0;
-  virtual JArray< jbyte > * engineGetIV() = 0;
-  virtual jint engineGetKeySize(::java::security::Key *);
-  virtual jint engineGetOutputSize(jint) = 0;
-  virtual ::java::security::AlgorithmParameters * engineGetParameters() = 0;
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual void engineSetMode(::java::lang::String *) = 0;
-  virtual void engineSetPadding(::java::lang::String *) = 0;
-  virtual ::java::security::Key * engineUnwrap(JArray< jbyte > *, ::java::lang::String *, jint);
-  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
-  virtual jint engineUpdate(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * engineWrap(::java::security::Key *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_CipherSpi__
diff --git a/libjava/javax/crypto/EncryptedPrivateKeyInfo.h b/libjava/javax/crypto/EncryptedPrivateKeyInfo.h
deleted file mode 100644
index 54818e1b55f..00000000000
--- a/libjava/javax/crypto/EncryptedPrivateKeyInfo.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_EncryptedPrivateKeyInfo__
-#define __javax_crypto_EncryptedPrivateKeyInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-      namespace spec
-      {
-          class PKCS8EncodedKeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class EncryptedPrivateKeyInfo;
-    }
-  }
-}
-
-class javax::crypto::EncryptedPrivateKeyInfo : public ::java::lang::Object
-{
-
-public:
-  EncryptedPrivateKeyInfo(::java::security::AlgorithmParameters *, JArray< jbyte > *);
-  EncryptedPrivateKeyInfo(JArray< jbyte > *);
-  EncryptedPrivateKeyInfo(::java::lang::String *, JArray< jbyte > *);
-private:
-  static ::gnu::java::security::OID * getOid(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgName();
-  virtual ::java::security::AlgorithmParameters * getAlgParameters();
-  virtual JArray< jbyte > * getEncoded();
-  virtual JArray< jbyte > * getEncryptedData();
-  virtual ::java::security::spec::PKCS8EncodedKeySpec * getKeySpec(::javax::crypto::Cipher *);
-private:
-  void decode();
-  void encode();
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encryptedData;
-  JArray< jbyte > * encoded;
-  ::gnu::java::security::OID * algOid;
-  ::java::lang::String * algName;
-  ::java::security::AlgorithmParameters * params;
-  JArray< jbyte > * encodedParams;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_EncryptedPrivateKeyInfo__
diff --git a/libjava/javax/crypto/ExemptionMechanism.h b/libjava/javax/crypto/ExemptionMechanism.h
deleted file mode 100644
index 65a0454661c..00000000000
--- a/libjava/javax/crypto/ExemptionMechanism.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_ExemptionMechanism__
-#define __javax_crypto_ExemptionMechanism__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class Provider;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class ExemptionMechanism;
-        class ExemptionMechanismSpi;
-    }
-  }
-}
-
-class javax::crypto::ExemptionMechanism : public ::java::lang::Object
-{
-
-public: // actually protected
-  ExemptionMechanism(::javax::crypto::ExemptionMechanismSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *);
-  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual JArray< jbyte > * genExemptionBlob();
-  virtual jint genExemptionBlob(JArray< jbyte > *);
-  virtual jint genExemptionBlob(JArray< jbyte > *, jint);
-  virtual ::java::lang::String * getName();
-  virtual jint getOutputSize(jint);
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::Key *);
-  virtual void init(::java::security::Key *, ::java::security::AlgorithmParameters *);
-  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual jboolean isCryptoAllowed(::java::security::Key *);
-public: // actually protected
-  virtual void finalize();
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::ExemptionMechanismSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) emSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * mechanism;
-  jboolean virgin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_ExemptionMechanism__
diff --git a/libjava/javax/crypto/ExemptionMechanismException.h b/libjava/javax/crypto/ExemptionMechanismException.h
deleted file mode 100644
index 79dd95f2069..00000000000
--- a/libjava/javax/crypto/ExemptionMechanismException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_ExemptionMechanismException__
-#define __javax_crypto_ExemptionMechanismException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class ExemptionMechanismException;
-    }
-  }
-}
-
-class javax::crypto::ExemptionMechanismException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  ExemptionMechanismException();
-  ExemptionMechanismException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1572699429277957109LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_ExemptionMechanismException__
diff --git a/libjava/javax/crypto/ExemptionMechanismSpi.h b/libjava/javax/crypto/ExemptionMechanismSpi.h
deleted file mode 100644
index 70c738eb654..00000000000
--- a/libjava/javax/crypto/ExemptionMechanismSpi.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_ExemptionMechanismSpi__
-#define __javax_crypto_ExemptionMechanismSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class ExemptionMechanismSpi;
-    }
-  }
-}
-
-class javax::crypto::ExemptionMechanismSpi : public ::java::lang::Object
-{
-
-public:
-  ExemptionMechanismSpi();
-public: // actually protected
-  virtual JArray< jbyte > * engineGenExemptionBlob() = 0;
-  virtual jint engineGenExemptionBlob(JArray< jbyte > *, jint) = 0;
-  virtual jint engineGetOutputSize(jint) = 0;
-  virtual void engineInit(::java::security::Key *) = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::AlgorithmParameters *) = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_ExemptionMechanismSpi__
diff --git a/libjava/javax/crypto/IllegalBlockSizeException.h b/libjava/javax/crypto/IllegalBlockSizeException.h
deleted file mode 100644
index 22176b1e504..00000000000
--- a/libjava/javax/crypto/IllegalBlockSizeException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_IllegalBlockSizeException__
-#define __javax_crypto_IllegalBlockSizeException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class IllegalBlockSizeException;
-    }
-  }
-}
-
-class javax::crypto::IllegalBlockSizeException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  IllegalBlockSizeException();
-  IllegalBlockSizeException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1965144811953540392LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_IllegalBlockSizeException__
diff --git a/libjava/javax/crypto/KeyAgreement.h b/libjava/javax/crypto/KeyAgreement.h
deleted file mode 100644
index 5f6b4e7617c..00000000000
--- a/libjava/javax/crypto/KeyAgreement.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_KeyAgreement__
-#define __javax_crypto_KeyAgreement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyAgreement;
-        class KeyAgreementSpi;
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::KeyAgreement : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyAgreement(::javax::crypto::KeyAgreementSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *);
-  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Key * doPhase(::java::security::Key *, jboolean);
-  virtual JArray< jbyte > * generateSecret();
-  virtual jint generateSecret(JArray< jbyte > *, jint);
-  virtual ::javax::crypto::SecretKey * generateSecret(::java::lang::String *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::Key *);
-  virtual void init(::java::security::Key *, ::java::security::SecureRandom *);
-  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::KeyAgreementSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kaSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-  jboolean virgin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_KeyAgreement__
diff --git a/libjava/javax/crypto/KeyAgreementSpi.h b/libjava/javax/crypto/KeyAgreementSpi.h
deleted file mode 100644
index e0ac5eb1a2e..00000000000
--- a/libjava/javax/crypto/KeyAgreementSpi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_KeyAgreementSpi__
-#define __javax_crypto_KeyAgreementSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyAgreementSpi;
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::KeyAgreementSpi : public ::java::lang::Object
-{
-
-public:
-  KeyAgreementSpi();
-public: // actually protected
-  virtual ::java::security::Key * engineDoPhase(::java::security::Key *, jboolean) = 0;
-  virtual JArray< jbyte > * engineGenerateSecret() = 0;
-  virtual jint engineGenerateSecret(JArray< jbyte > *, jint) = 0;
-  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::lang::String *) = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::SecureRandom *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_KeyAgreementSpi__
diff --git a/libjava/javax/crypto/KeyGenerator.h b/libjava/javax/crypto/KeyGenerator.h
deleted file mode 100644
index ea785044eea..00000000000
--- a/libjava/javax/crypto/KeyGenerator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_KeyGenerator__
-#define __javax_crypto_KeyGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyGenerator;
-        class KeyGeneratorSpi;
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::KeyGenerator : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyGenerator(::javax::crypto::KeyGeneratorSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *);
-  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::javax::crypto::SecretKey * generateKey();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void init(jint);
-  virtual void init(jint, ::java::security::SecureRandom *);
-  virtual void init(::java::security::SecureRandom *);
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::KeyGeneratorSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kgSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_KeyGenerator__
diff --git a/libjava/javax/crypto/KeyGeneratorSpi.h b/libjava/javax/crypto/KeyGeneratorSpi.h
deleted file mode 100644
index 4fb3574260d..00000000000
--- a/libjava/javax/crypto/KeyGeneratorSpi.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_KeyGeneratorSpi__
-#define __javax_crypto_KeyGeneratorSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyGeneratorSpi;
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::KeyGeneratorSpi : public ::java::lang::Object
-{
-
-public:
-  KeyGeneratorSpi();
-public: // actually protected
-  virtual ::javax::crypto::SecretKey * engineGenerateKey() = 0;
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(jint, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(::java::security::SecureRandom *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_KeyGeneratorSpi__
diff --git a/libjava/javax/crypto/Mac.h b/libjava/javax/crypto/Mac.h
deleted file mode 100644
index d9242114635..00000000000
--- a/libjava/javax/crypto/Mac.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_Mac__
-#define __javax_crypto_Mac__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class Key;
-        class Provider;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Mac;
-        class MacSpi;
-    }
-  }
-}
-
-class javax::crypto::Mac : public ::java::lang::Object
-{
-
-public: // actually protected
-  Mac(::javax::crypto::MacSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::Mac * getInstance(::java::lang::String *);
-  static ::javax::crypto::Mac * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::Mac * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual JArray< jbyte > * doFinal();
-  virtual JArray< jbyte > * doFinal(JArray< jbyte > *);
-  virtual void doFinal(JArray< jbyte > *, jint);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual jint getMacLength();
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::Key *);
-  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void reset();
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual void update(::java::nio::ByteBuffer *);
-  virtual ::java::lang::Object * clone();
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::MacSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) macSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-  jboolean virgin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_Mac__
diff --git a/libjava/javax/crypto/MacSpi.h b/libjava/javax/crypto/MacSpi.h
deleted file mode 100644
index 4508d2f00e7..00000000000
--- a/libjava/javax/crypto/MacSpi.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_MacSpi__
-#define __javax_crypto_MacSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class MacSpi;
-    }
-  }
-}
-
-class javax::crypto::MacSpi : public ::java::lang::Object
-{
-
-public:
-  MacSpi();
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual JArray< jbyte > * engineDoFinal() = 0;
-  virtual jint engineGetMacLength() = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *) = 0;
-  virtual void engineReset() = 0;
-  virtual void engineUpdate(jbyte) = 0;
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint) = 0;
-  virtual void engineUpdate(::java::nio::ByteBuffer *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_MacSpi__
diff --git a/libjava/javax/crypto/NoSuchPaddingException.h b/libjava/javax/crypto/NoSuchPaddingException.h
deleted file mode 100644
index 76d4f3952d4..00000000000
--- a/libjava/javax/crypto/NoSuchPaddingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_NoSuchPaddingException__
-#define __javax_crypto_NoSuchPaddingException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class NoSuchPaddingException;
-    }
-  }
-}
-
-class javax::crypto::NoSuchPaddingException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  NoSuchPaddingException();
-  NoSuchPaddingException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4572885201200175466LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_NoSuchPaddingException__
diff --git a/libjava/javax/crypto/NullCipher.h b/libjava/javax/crypto/NullCipher.h
deleted file mode 100644
index 2fc8378f316..00000000000
--- a/libjava/javax/crypto/NullCipher.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_NullCipher__
-#define __javax_crypto_NullCipher__
-
-#pragma interface
-
-#include <javax/crypto/Cipher.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class NullCipher;
-    }
-  }
-}
-
-class javax::crypto::NullCipher : public ::javax::crypto::Cipher
-{
-
-public:
-  NullCipher();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_NullCipher__
diff --git a/libjava/javax/crypto/NullCipherImpl.h b/libjava/javax/crypto/NullCipherImpl.h
deleted file mode 100644
index 56cccfe2430..00000000000
--- a/libjava/javax/crypto/NullCipherImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_NullCipherImpl__
-#define __javax_crypto_NullCipherImpl__
-
-#pragma interface
-
-#include <javax/crypto/CipherSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class NullCipherImpl;
-    }
-  }
-}
-
-class javax::crypto::NullCipherImpl : public ::javax::crypto::CipherSpi
-{
-
-public: // actually package-private
-  NullCipherImpl();
-public: // actually protected
-  void engineSetMode(::java::lang::String *);
-  void engineSetPadding(::java::lang::String *);
-  jint engineGetBlockSize();
-  jint engineGetOutputSize(jint);
-  JArray< jbyte > * engineGetIV();
-  ::java::security::AlgorithmParameters * engineGetParameters();
-  void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-  void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-  JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
-  jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
-  jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_NullCipherImpl__
diff --git a/libjava/javax/crypto/SealedObject.h b/libjava/javax/crypto/SealedObject.h
deleted file mode 100644
index 630f8ec5f3a..00000000000
--- a/libjava/javax/crypto/SealedObject.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_SealedObject__
-#define __javax_crypto_SealedObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class SealedObject;
-    }
-  }
-}
-
-class javax::crypto::SealedObject : public ::java::lang::Object
-{
-
-public:
-  SealedObject(::java::io::Serializable *, ::javax::crypto::Cipher *);
-public: // actually protected
-  SealedObject(::javax::crypto::SealedObject *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::Object * getObject(::javax::crypto::Cipher *);
-  virtual ::java::lang::Object * getObject(::java::security::Key *);
-  virtual ::java::lang::Object * getObject(::java::security::Key *, ::java::lang::String *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  ::java::lang::Object * unseal();
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encodedParams;
-private:
-  JArray< jbyte > * encryptedContent;
-  ::java::lang::String * sealAlg;
-  ::java::lang::String * paramsAlg;
-  ::javax::crypto::Cipher * sealCipher;
-  static const jlong serialVersionUID = 4482838265551344752LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_SealedObject__
diff --git a/libjava/javax/crypto/SecretKey.h b/libjava/javax/crypto/SecretKey.h
deleted file mode 100644
index d76e7286836..00000000000
--- a/libjava/javax/crypto/SecretKey.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_SecretKey__
-#define __javax_crypto_SecretKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::SecretKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = -4795878709595146952LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_SecretKey__
diff --git a/libjava/javax/crypto/SecretKeyFactory.h b/libjava/javax/crypto/SecretKeyFactory.h
deleted file mode 100644
index 2e10b769c63..00000000000
--- a/libjava/javax/crypto/SecretKeyFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_SecretKeyFactory__
-#define __javax_crypto_SecretKeyFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-        class SecretKeyFactory;
-        class SecretKeyFactorySpi;
-    }
-  }
-}
-
-class javax::crypto::SecretKeyFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  SecretKeyFactory(::javax::crypto::SecretKeyFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *);
-  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::javax::crypto::SecretKey * generateSecret(::java::security::spec::KeySpec *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::spec::KeySpec * getKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
-  virtual ::java::security::Provider * getProvider();
-  virtual ::javax::crypto::SecretKey * translateKey(::javax::crypto::SecretKey *);
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::SecretKeyFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) skfSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_SecretKeyFactory__
diff --git a/libjava/javax/crypto/SecretKeyFactorySpi.h b/libjava/javax/crypto/SecretKeyFactorySpi.h
deleted file mode 100644
index 91a17d69aa7..00000000000
--- a/libjava/javax/crypto/SecretKeyFactorySpi.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_SecretKeyFactorySpi__
-#define __javax_crypto_SecretKeyFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-        class SecretKeyFactorySpi;
-    }
-  }
-}
-
-class javax::crypto::SecretKeyFactorySpi : public ::java::lang::Object
-{
-
-public:
-  SecretKeyFactorySpi();
-public: // actually protected
-  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *) = 0;
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *) = 0;
-  virtual ::javax::crypto::SecretKey * engineTranslateKey(::javax::crypto::SecretKey *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_SecretKeyFactorySpi__
diff --git a/libjava/javax/crypto/ShortBufferException.h b/libjava/javax/crypto/ShortBufferException.h
deleted file mode 100644
index 1c3d344e6d8..00000000000
--- a/libjava/javax/crypto/ShortBufferException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_ShortBufferException__
-#define __javax_crypto_ShortBufferException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class ShortBufferException;
-    }
-  }
-}
-
-class javax::crypto::ShortBufferException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  ShortBufferException();
-  ShortBufferException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8427718640832943747LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_ShortBufferException__
diff --git a/libjava/javax/crypto/interfaces/DHKey.h b/libjava/javax/crypto/interfaces/DHKey.h
deleted file mode 100644
index a425a9263bd..00000000000
--- a/libjava/javax/crypto/interfaces/DHKey.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_interfaces_DHKey__
-#define __javax_crypto_interfaces_DHKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHKey;
-      }
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::interfaces::DHKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_interfaces_DHKey__
diff --git a/libjava/javax/crypto/interfaces/DHPrivateKey.h b/libjava/javax/crypto/interfaces/DHPrivateKey.h
deleted file mode 100644
index 500bb2a688a..00000000000
--- a/libjava/javax/crypto/interfaces/DHPrivateKey.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_interfaces_DHPrivateKey__
-#define __javax_crypto_interfaces_DHPrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPrivateKey;
-      }
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::interfaces::DHPrivateKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getX() = 0;
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 2211791113380396553LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_interfaces_DHPrivateKey__
diff --git a/libjava/javax/crypto/interfaces/DHPublicKey.h b/libjava/javax/crypto/interfaces/DHPublicKey.h
deleted file mode 100644
index 36ebfc5736a..00000000000
--- a/libjava/javax/crypto/interfaces/DHPublicKey.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_interfaces_DHPublicKey__
-#define __javax_crypto_interfaces_DHPublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPublicKey;
-      }
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::interfaces::DHPublicKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getY() = 0;
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = -6628103563352519193LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_interfaces_DHPublicKey__
diff --git a/libjava/javax/crypto/interfaces/PBEKey.h b/libjava/javax/crypto/interfaces/PBEKey.h
deleted file mode 100644
index ff8f1ea4a68..00000000000
--- a/libjava/javax/crypto/interfaces/PBEKey.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_interfaces_PBEKey__
-#define __javax_crypto_interfaces_PBEKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class PBEKey;
-      }
-    }
-  }
-}
-
-class javax::crypto::interfaces::PBEKey : public ::java::lang::Object
-{
-
-public:
-  virtual jint getIterationCount() = 0;
-  virtual JArray< jchar > * getPassword() = 0;
-  virtual JArray< jbyte > * getSalt() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = -1430015993304333921LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_interfaces_PBEKey__
diff --git a/libjava/javax/crypto/spec/DESKeySpec.h b/libjava/javax/crypto/spec/DESKeySpec.h
deleted file mode 100644
index 3c860452bb3..00000000000
--- a/libjava/javax/crypto/spec/DESKeySpec.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DESKeySpec__
-#define __javax_crypto_spec_DESKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DESKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DESKeySpec : public ::java::lang::Object
-{
-
-public:
-  DESKeySpec(JArray< jbyte > *);
-  DESKeySpec(JArray< jbyte > *, jint);
-  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
-  static jboolean isWeak(JArray< jbyte > *, jint);
-private:
-  static jboolean equalsOrComplementEquals(JArray< jbyte > *, jint, JArray< jbyte > *);
-public:
-  virtual JArray< jbyte > * getKey();
-  static const jint DES_KEY_LEN = 8;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  static JArray< JArray< jbyte > * > * WEAK_KEYS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DESKeySpec__
diff --git a/libjava/javax/crypto/spec/DESedeKeySpec.h b/libjava/javax/crypto/spec/DESedeKeySpec.h
deleted file mode 100644
index 28e23bb13c0..00000000000
--- a/libjava/javax/crypto/spec/DESedeKeySpec.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DESedeKeySpec__
-#define __javax_crypto_spec_DESedeKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DESedeKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DESedeKeySpec : public ::java::lang::Object
-{
-
-public:
-  DESedeKeySpec(JArray< jbyte > *);
-  DESedeKeySpec(JArray< jbyte > *, jint);
-  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * getKey();
-  static const jint DES_EDE_KEY_LEN = 24;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DESedeKeySpec__
diff --git a/libjava/javax/crypto/spec/DHGenParameterSpec.h b/libjava/javax/crypto/spec/DHGenParameterSpec.h
deleted file mode 100644
index 79331116f9b..00000000000
--- a/libjava/javax/crypto/spec/DHGenParameterSpec.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DHGenParameterSpec__
-#define __javax_crypto_spec_DHGenParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHGenParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DHGenParameterSpec : public ::java::lang::Object
-{
-
-public:
-  DHGenParameterSpec(jint, jint);
-  virtual jint getExponentSize();
-  virtual jint getPrimeSize();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) primeSize;
-  jint exponentSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DHGenParameterSpec__
diff --git a/libjava/javax/crypto/spec/DHParameterSpec.h b/libjava/javax/crypto/spec/DHParameterSpec.h
deleted file mode 100644
index 7f7dd3fcd7a..00000000000
--- a/libjava/javax/crypto/spec/DHParameterSpec.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DHParameterSpec__
-#define __javax_crypto_spec_DHParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DHParameterSpec : public ::java::lang::Object
-{
-
-public:
-  DHParameterSpec(::java::math::BigInteger *, ::java::math::BigInteger *);
-  DHParameterSpec(::java::math::BigInteger *, ::java::math::BigInteger *, jint);
-  virtual ::java::math::BigInteger * getG();
-  virtual jint getL();
-  virtual ::java::math::BigInteger * getP();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
-  ::java::math::BigInteger * p;
-  jint l;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DHParameterSpec__
diff --git a/libjava/javax/crypto/spec/DHPrivateKeySpec.h b/libjava/javax/crypto/spec/DHPrivateKeySpec.h
deleted file mode 100644
index c21a9e2e17e..00000000000
--- a/libjava/javax/crypto/spec/DHPrivateKeySpec.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DHPrivateKeySpec__
-#define __javax_crypto_spec_DHPrivateKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHPrivateKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DHPrivateKeySpec : public ::java::lang::Object
-{
-
-public:
-  DHPrivateKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getG();
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getX();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * x;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DHPrivateKeySpec__
diff --git a/libjava/javax/crypto/spec/DHPublicKeySpec.h b/libjava/javax/crypto/spec/DHPublicKeySpec.h
deleted file mode 100644
index ae1a2bf557c..00000000000
--- a/libjava/javax/crypto/spec/DHPublicKeySpec.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DHPublicKeySpec__
-#define __javax_crypto_spec_DHPublicKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHPublicKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DHPublicKeySpec : public ::java::lang::Object
-{
-
-public:
-  DHPublicKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getG();
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getY();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DHPublicKeySpec__
diff --git a/libjava/javax/crypto/spec/IvParameterSpec.h b/libjava/javax/crypto/spec/IvParameterSpec.h
deleted file mode 100644
index e5799e47fcc..00000000000
--- a/libjava/javax/crypto/spec/IvParameterSpec.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_IvParameterSpec__
-#define __javax_crypto_spec_IvParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class IvParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::IvParameterSpec : public ::java::lang::Object
-{
-
-public:
-  IvParameterSpec(JArray< jbyte > *);
-  IvParameterSpec(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * getIV();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iv;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_IvParameterSpec__
diff --git a/libjava/javax/crypto/spec/PBEKeySpec.h b/libjava/javax/crypto/spec/PBEKeySpec.h
deleted file mode 100644
index f987069389d..00000000000
--- a/libjava/javax/crypto/spec/PBEKeySpec.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_PBEKeySpec__
-#define __javax_crypto_spec_PBEKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class PBEKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::PBEKeySpec : public ::java::lang::Object
-{
-
-public:
-  PBEKeySpec(JArray< jchar > *);
-  PBEKeySpec(JArray< jchar > *, JArray< jbyte > *, jint);
-  PBEKeySpec(JArray< jchar > *, JArray< jbyte > *, jint, jint);
-  virtual void clearPassword();
-  virtual jint getIterationCount();
-  virtual jint getKeyLength();
-  virtual JArray< jchar > * getPassword();
-  virtual JArray< jbyte > * getSalt();
-private:
-  void setPassword(JArray< jchar > *);
-  void setSalt(JArray< jbyte > *);
-  void setIterationCount(jint);
-  void setKeyLength(jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterationCount;
-  jint keyLength;
-  JArray< jchar > * password;
-  JArray< jbyte > * salt;
-  jboolean passwordValid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_PBEKeySpec__
diff --git a/libjava/javax/crypto/spec/PBEParameterSpec.h b/libjava/javax/crypto/spec/PBEParameterSpec.h
deleted file mode 100644
index eb81ca7dc4c..00000000000
--- a/libjava/javax/crypto/spec/PBEParameterSpec.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_PBEParameterSpec__
-#define __javax_crypto_spec_PBEParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class PBEParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::PBEParameterSpec : public ::java::lang::Object
-{
-
-public:
-  PBEParameterSpec(JArray< jbyte > *, jint);
-  virtual jint getIterationCount();
-  virtual JArray< jbyte > * getSalt();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterationCount;
-  JArray< jbyte > * salt;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_PBEParameterSpec__
diff --git a/libjava/javax/crypto/spec/RC2ParameterSpec.h b/libjava/javax/crypto/spec/RC2ParameterSpec.h
deleted file mode 100644
index 419dc752b34..00000000000
--- a/libjava/javax/crypto/spec/RC2ParameterSpec.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_RC2ParameterSpec__
-#define __javax_crypto_spec_RC2ParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class RC2ParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::RC2ParameterSpec : public ::java::lang::Object
-{
-
-public:
-  RC2ParameterSpec(jint);
-  RC2ParameterSpec(jint, JArray< jbyte > *);
-  RC2ParameterSpec(jint, JArray< jbyte > *, jint);
-  virtual jint getEffectiveKeyBits();
-  virtual JArray< jbyte > * getIV();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jint RC2_IV_LENGTH = 8;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) effectiveKeyBits;
-  JArray< jbyte > * iv;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_RC2ParameterSpec__
diff --git a/libjava/javax/crypto/spec/RC5ParameterSpec.h b/libjava/javax/crypto/spec/RC5ParameterSpec.h
deleted file mode 100644
index 8ba9232cd65..00000000000
--- a/libjava/javax/crypto/spec/RC5ParameterSpec.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_RC5ParameterSpec__
-#define __javax_crypto_spec_RC5ParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class RC5ParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::RC5ParameterSpec : public ::java::lang::Object
-{
-
-public:
-  RC5ParameterSpec(jint, jint, jint);
-  RC5ParameterSpec(jint, jint, jint, JArray< jbyte > *);
-  RC5ParameterSpec(jint, jint, jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * getIV();
-  virtual jint getRounds();
-  virtual jint getVersion();
-  virtual jint getWordSize();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iv;
-  jint rounds;
-  jint version;
-  jint wordSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_RC5ParameterSpec__
diff --git a/libjava/javax/crypto/spec/SecretKeySpec.h b/libjava/javax/crypto/spec/SecretKeySpec.h
deleted file mode 100644
index b6a2e04ced3..00000000000
--- a/libjava/javax/crypto/spec/SecretKeySpec.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_SecretKeySpec__
-#define __javax_crypto_spec_SecretKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class SecretKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::SecretKeySpec : public ::java::lang::Object
-{
-
-public:
-  SecretKeySpec(JArray< jbyte > *, ::java::lang::String *);
-  SecretKeySpec(JArray< jbyte > *, jint, jint, ::java::lang::String *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = 6577238317307289933LL;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_SecretKeySpec__
diff --git a/libjava/javax/imageio/IIOException.h b/libjava/javax/imageio/IIOException.h
deleted file mode 100644
index b303de89819..00000000000
--- a/libjava/javax/imageio/IIOException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_IIOException__
-#define __javax_imageio_IIOException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOException;
-    }
-  }
-}
-
-class javax::imageio::IIOException : public ::java::io::IOException
-{
-
-public:
-  IIOException(::java::lang::String *);
-  IIOException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_IIOException__
diff --git a/libjava/javax/imageio/IIOImage.h b/libjava/javax/imageio/IIOImage.h
deleted file mode 100644
index ae23913df8b..00000000000
--- a/libjava/javax/imageio/IIOImage.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_IIOImage__
-#define __javax_imageio_IIOImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class Raster;
-          class RenderedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class javax::imageio::IIOImage : public ::java::lang::Object
-{
-
-public:
-  IIOImage(::java::awt::image::Raster *, ::java::util::List *, ::javax::imageio::metadata::IIOMetadata *);
-  IIOImage(::java::awt::image::RenderedImage *, ::java::util::List *, ::javax::imageio::metadata::IIOMetadata *);
-  virtual ::javax::imageio::metadata::IIOMetadata * getMetadata();
-  virtual jint getNumThumbnails();
-  virtual ::java::awt::image::Raster * getRaster();
-  virtual ::java::awt::image::RenderedImage * getRenderedImage();
-  virtual ::java::awt::image::BufferedImage * getThumbnail(jint);
-  virtual ::java::util::List * getThumbnails();
-  virtual jboolean hasRaster();
-  virtual void setMetadata(::javax::imageio::metadata::IIOMetadata *);
-  virtual void setRaster(::java::awt::image::Raster *);
-  virtual void setRenderedImage(::java::awt::image::RenderedImage *);
-  virtual void setThumbnails(::java::util::List *);
-public: // actually protected
-  ::java::awt::image::RenderedImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::javax::imageio::metadata::IIOMetadata * metadata;
-  ::java::awt::image::Raster * raster;
-  ::java::util::List * thumbnails;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_IIOImage__
diff --git a/libjava/javax/imageio/IIOParam.h b/libjava/javax/imageio/IIOParam.h
deleted file mode 100644
index ca81aea23cf..00000000000
--- a/libjava/javax/imageio/IIOParam.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_IIOParam__
-#define __javax_imageio_IIOParam__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOParam;
-        class IIOParamController;
-        class ImageTypeSpecifier;
-    }
-  }
-}
-
-class javax::imageio::IIOParam : public ::java::lang::Object
-{
-
-public: // actually protected
-  IIOParam();
-public:
-  virtual jboolean activateController();
-  virtual ::javax::imageio::IIOParamController * getController();
-  virtual ::javax::imageio::IIOParamController * getDefaultController();
-  virtual ::java::awt::Point * getDestinationOffset();
-  virtual ::javax::imageio::ImageTypeSpecifier * getDestinationType();
-  virtual JArray< jint > * getSourceBands();
-  virtual ::java::awt::Rectangle * getSourceRegion();
-  virtual jint getSourceXSubsampling();
-  virtual jint getSourceYSubsampling();
-  virtual jint getSubsamplingXOffset();
-  virtual jint getSubsamplingYOffset();
-  virtual jboolean hasController();
-  virtual void setController(::javax::imageio::IIOParamController *);
-  virtual void setDestinationType(::javax::imageio::ImageTypeSpecifier *);
-  virtual void setDestinationOffset(::java::awt::Point *);
-  virtual void setSourceBands(JArray< jint > *);
-  virtual void setSourceRegion(::java::awt::Rectangle *);
-  virtual void setSourceSubsampling(jint, jint, jint, jint);
-public: // actually protected
-  ::javax::imageio::IIOParamController * __attribute__((aligned(__alignof__( ::java::lang::Object)))) controller;
-  ::javax::imageio::IIOParamController * defaultController;
-  ::java::awt::Point * destinationOffset;
-  ::javax::imageio::ImageTypeSpecifier * destinationType;
-  JArray< jint > * sourceBands;
-  ::java::awt::Rectangle * sourceRegion;
-  jint sourceXSubsampling;
-  jint sourceYSubsampling;
-  jint subsamplingXOffset;
-  jint subsamplingYOffset;
-private:
-  jboolean no_controller;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_IIOParam__
diff --git a/libjava/javax/imageio/IIOParamController.h b/libjava/javax/imageio/IIOParamController.h
deleted file mode 100644
index 3e9d52d50bf..00000000000
--- a/libjava/javax/imageio/IIOParamController.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_IIOParamController__
-#define __javax_imageio_IIOParamController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOParam;
-        class IIOParamController;
-    }
-  }
-}
-
-class javax::imageio::IIOParamController : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean activate(::javax::imageio::IIOParam *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_IIOParamController__
diff --git a/libjava/javax/imageio/ImageIO$1.h b/libjava/javax/imageio/ImageIO$1.h
deleted file mode 100644
index 9777688a099..00000000000
--- a/libjava/javax/imageio/ImageIO$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$1__
-#define __javax_imageio_ImageIO$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$1;
-        class ImageTranscoder;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImageIO$1(::java::util::Iterator *);
-public:
-  virtual jboolean hasNext();
-  virtual ::javax::imageio::ImageTranscoder * ImageIO$1$next();
-  virtual void remove();
-  virtual ::java::lang::Object * next();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$spiIterator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$1__
diff --git a/libjava/javax/imageio/ImageIO$ImageReaderIterator.h b/libjava/javax/imageio/ImageIO$ImageReaderIterator.h
deleted file mode 100644
index bb0285eee30..00000000000
--- a/libjava/javax/imageio/ImageIO$ImageReaderIterator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ImageReaderIterator__
-#define __javax_imageio_ImageIO$ImageReaderIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ImageReaderIterator;
-        class ImageReader;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ImageReaderIterator : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ImageReaderIterator(::java::util::Iterator *, ::java::lang::Object *);
-  ImageIO$ImageReaderIterator(::java::util::Iterator *);
-  jboolean hasNext();
-  ::javax::imageio::ImageReader * ImageIO$ImageReaderIterator$next();
-  void remove();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) it;
-  ::java::lang::Object * readerExtension;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ImageReaderIterator__
diff --git a/libjava/javax/imageio/ImageIO$ImageWriterIterator.h b/libjava/javax/imageio/ImageIO$ImageWriterIterator.h
deleted file mode 100644
index dcf9101f00d..00000000000
--- a/libjava/javax/imageio/ImageIO$ImageWriterIterator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ImageWriterIterator__
-#define __javax_imageio_ImageIO$ImageWriterIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ImageWriterIterator;
-        class ImageWriter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ImageWriterIterator : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ImageWriterIterator(::java::util::Iterator *, ::java::lang::Object *);
-  ImageIO$ImageWriterIterator(::java::util::Iterator *);
-  jboolean hasNext();
-  ::javax::imageio::ImageWriter * ImageIO$ImageWriterIterator$next();
-  void remove();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) it;
-  ::java::lang::Object * writerExtension;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ImageWriterIterator__
diff --git a/libjava/javax/imageio/ImageIO$ReaderFormatFilter.h b/libjava/javax/imageio/ImageIO$ReaderFormatFilter.h
deleted file mode 100644
index a1d35dbff5b..00000000000
--- a/libjava/javax/imageio/ImageIO$ReaderFormatFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ReaderFormatFilter__
-#define __javax_imageio_ImageIO$ReaderFormatFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ReaderFormatFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ReaderFormatFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ReaderFormatFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) formatName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ReaderFormatFilter__
diff --git a/libjava/javax/imageio/ImageIO$ReaderMIMETypeFilter.h b/libjava/javax/imageio/ImageIO$ReaderMIMETypeFilter.h
deleted file mode 100644
index 7f7503278eb..00000000000
--- a/libjava/javax/imageio/ImageIO$ReaderMIMETypeFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ReaderMIMETypeFilter__
-#define __javax_imageio_ImageIO$ReaderMIMETypeFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ReaderMIMETypeFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ReaderMIMETypeFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ReaderMIMETypeFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) MIMEType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ReaderMIMETypeFilter__
diff --git a/libjava/javax/imageio/ImageIO$ReaderObjectFilter.h b/libjava/javax/imageio/ImageIO$ReaderObjectFilter.h
deleted file mode 100644
index 929530f2b09..00000000000
--- a/libjava/javax/imageio/ImageIO$ReaderObjectFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ReaderObjectFilter__
-#define __javax_imageio_ImageIO$ReaderObjectFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ReaderObjectFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ReaderObjectFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ReaderObjectFilter(::java::lang::Object *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) object;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ReaderObjectFilter__
diff --git a/libjava/javax/imageio/ImageIO$ReaderSuffixFilter.h b/libjava/javax/imageio/ImageIO$ReaderSuffixFilter.h
deleted file mode 100644
index b4dc85d1319..00000000000
--- a/libjava/javax/imageio/ImageIO$ReaderSuffixFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ReaderSuffixFilter__
-#define __javax_imageio_ImageIO$ReaderSuffixFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ReaderSuffixFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ReaderSuffixFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ReaderSuffixFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fileSuffix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ReaderSuffixFilter__
diff --git a/libjava/javax/imageio/ImageIO$TranscoderFilter.h b/libjava/javax/imageio/ImageIO$TranscoderFilter.h
deleted file mode 100644
index 48b9f104e78..00000000000
--- a/libjava/javax/imageio/ImageIO$TranscoderFilter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$TranscoderFilter__
-#define __javax_imageio_ImageIO$TranscoderFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$TranscoderFilter;
-        class ImageReader;
-        class ImageWriter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$TranscoderFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$TranscoderFilter(::javax::imageio::ImageReader *, ::javax::imageio::ImageWriter *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::javax::imageio::ImageReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) reader;
-  ::javax::imageio::ImageWriter * writer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$TranscoderFilter__
diff --git a/libjava/javax/imageio/ImageIO$WriterFormatFilter.h b/libjava/javax/imageio/ImageIO$WriterFormatFilter.h
deleted file mode 100644
index 5b71fda59c0..00000000000
--- a/libjava/javax/imageio/ImageIO$WriterFormatFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$WriterFormatFilter__
-#define __javax_imageio_ImageIO$WriterFormatFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$WriterFormatFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$WriterFormatFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$WriterFormatFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) formatName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$WriterFormatFilter__
diff --git a/libjava/javax/imageio/ImageIO$WriterMIMETypeFilter.h b/libjava/javax/imageio/ImageIO$WriterMIMETypeFilter.h
deleted file mode 100644
index fc35a0d38ee..00000000000
--- a/libjava/javax/imageio/ImageIO$WriterMIMETypeFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$WriterMIMETypeFilter__
-#define __javax_imageio_ImageIO$WriterMIMETypeFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$WriterMIMETypeFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$WriterMIMETypeFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$WriterMIMETypeFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) MIMEType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$WriterMIMETypeFilter__
diff --git a/libjava/javax/imageio/ImageIO$WriterObjectFilter.h b/libjava/javax/imageio/ImageIO$WriterObjectFilter.h
deleted file mode 100644
index 94500aed6f8..00000000000
--- a/libjava/javax/imageio/ImageIO$WriterObjectFilter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$WriterObjectFilter__
-#define __javax_imageio_ImageIO$WriterObjectFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$WriterObjectFilter;
-        class ImageTypeSpecifier;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$WriterObjectFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$WriterObjectFilter(::javax::imageio::ImageTypeSpecifier *, ::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::javax::imageio::ImageTypeSpecifier * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::lang::String * formatName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$WriterObjectFilter__
diff --git a/libjava/javax/imageio/ImageIO$WriterSuffixFilter.h b/libjava/javax/imageio/ImageIO$WriterSuffixFilter.h
deleted file mode 100644
index 9fc513410ab..00000000000
--- a/libjava/javax/imageio/ImageIO$WriterSuffixFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$WriterSuffixFilter__
-#define __javax_imageio_ImageIO$WriterSuffixFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$WriterSuffixFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$WriterSuffixFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$WriterSuffixFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fileSuffix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$WriterSuffixFilter__
diff --git a/libjava/javax/imageio/ImageIO.h b/libjava/javax/imageio/ImageIO.h
deleted file mode 100644
index 95309b7e7aa..00000000000
--- a/libjava/javax/imageio/ImageIO.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO__
-#define __javax_imageio_ImageIO__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class RenderedImage;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO;
-        class ImageReader;
-        class ImageTypeSpecifier;
-        class ImageWriter;
-      namespace spi
-      {
-          class IIORegistry;
-          class ServiceRegistry$Filter;
-      }
-      namespace stream
-      {
-          class ImageInputStream;
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::ImageIO : public ::java::lang::Object
-{
-
-  ImageIO();
-  static ::java::util::Iterator * getReadersByFilter(::java::lang::Class *, ::javax::imageio::spi::ServiceRegistry$Filter *, ::java::lang::Object *);
-  static ::java::util::Iterator * getWritersByFilter(::java::lang::Class *, ::javax::imageio::spi::ServiceRegistry$Filter *, ::java::lang::Object *);
-public:
-  static ::java::io::File * getCacheDirectory();
-  static ::java::util::Iterator * getImageReadersByFormatName(::java::lang::String *);
-  static ::java::util::Iterator * getImageReadersByMIMEType(::java::lang::String *);
-  static ::java::util::Iterator * getImageReadersBySuffix(::java::lang::String *);
-  static ::java::util::Iterator * getImageWritersByFormatName(::java::lang::String *);
-  static ::java::util::Iterator * getImageWritersByMIMEType(::java::lang::String *);
-  static ::java::util::Iterator * getImageWritersBySuffix(::java::lang::String *);
-  static JArray< ::java::lang::String * > * getReaderFormatNames();
-  static JArray< ::java::lang::String * > * getReaderMIMETypes();
-private:
-  static ::javax::imageio::spi::IIORegistry * getRegistry();
-public:
-  static jboolean getUseCache();
-  static JArray< ::java::lang::String * > * getWriterFormatNames();
-  static JArray< ::java::lang::String * > * getWriterMIMETypes();
-  static void scanForPlugins();
-  static void setCacheDirectory(::java::io::File *);
-  static void setUseCache(jboolean);
-  static jboolean write(::java::awt::image::RenderedImage *, ::java::lang::String *, ::java::io::File *);
-  static jboolean write(::java::awt::image::RenderedImage *, ::java::lang::String *, ::java::io::OutputStream *);
-  static jboolean write(::java::awt::image::RenderedImage *, ::java::lang::String *, ::javax::imageio::stream::ImageOutputStream *);
-  static ::java::awt::image::BufferedImage * read(::javax::imageio::stream::ImageInputStream *);
-  static ::java::awt::image::BufferedImage * read(::java::net::URL *);
-  static ::java::awt::image::BufferedImage * read(::java::io::InputStream *);
-  static ::java::awt::image::BufferedImage * read(::java::io::File *);
-  static ::javax::imageio::stream::ImageInputStream * createImageInputStream(::java::lang::Object *);
-  static ::javax::imageio::stream::ImageOutputStream * createImageOutputStream(::java::lang::Object *);
-  static ::javax::imageio::ImageReader * getImageReader(::javax::imageio::ImageWriter *);
-  static ::java::util::Iterator * getImageReaders(::java::lang::Object *);
-  static ::java::util::Iterator * getImageWriters(::javax::imageio::ImageTypeSpecifier *, ::java::lang::String *);
-  static ::javax::imageio::ImageWriter * getImageWriter(::javax::imageio::ImageReader *);
-  static ::java::util::Iterator * getImageTranscoders(::javax::imageio::ImageReader *, ::javax::imageio::ImageWriter *);
-private:
-  static ::java::io::File * cacheDirectory;
-  static jboolean useCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO__
diff --git a/libjava/javax/imageio/ImageReadParam.h b/libjava/javax/imageio/ImageReadParam.h
deleted file mode 100644
index 1e406ce705b..00000000000
--- a/libjava/javax/imageio/ImageReadParam.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageReadParam__
-#define __javax_imageio_ImageReadParam__
-
-#pragma interface
-
-#include <javax/imageio/IIOParam.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReadParam;
-    }
-  }
-}
-
-class javax::imageio::ImageReadParam : public ::javax::imageio::IIOParam
-{
-
-public:
-  ImageReadParam();
-  virtual jboolean canSetSourceRenderSize();
-  virtual ::java::awt::image::BufferedImage * getDestination();
-  virtual JArray< jint > * getDestinationBands();
-  virtual jint getSourceMaxProgressivePass();
-  virtual jint getSourceMinProgressivePass();
-  virtual jint getSourceNumProgressivePasses();
-  virtual ::java::awt::Dimension * getSourceRenderSize();
-  virtual void setDestination(::java::awt::image::BufferedImage *);
-  virtual void setDestinationBands(JArray< jint > *);
-  virtual void setSourceProgressivePasses(jint, jint);
-  virtual void setSourceRenderSize(::java::awt::Dimension *);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::imageio::IIOParam)))) canSetSourceRenderSize__;
-  ::java::awt::image::BufferedImage * destination;
-  JArray< jint > * destinationBands;
-  jint minProgressivePass;
-  jint numProgressivePasses;
-  ::java::awt::Dimension * sourceRenderSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageReadParam__
diff --git a/libjava/javax/imageio/ImageReader.h b/libjava/javax/imageio/ImageReader.h
deleted file mode 100644
index 83c50759840..00000000000
--- a/libjava/javax/imageio/ImageReader.h
+++ /dev/null
@@ -1,166 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageReader__
-#define __javax_imageio_ImageReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-          class Raster;
-          class RenderedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageReadParam;
-        class ImageReader;
-        class ImageTypeSpecifier;
-      namespace event
-      {
-          class IIOReadProgressListener;
-          class IIOReadUpdateListener;
-          class IIOReadWarningListener;
-      }
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace spi
-      {
-          class ImageReaderSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::ImageReader : public ::java::lang::Object
-{
-
-public: // actually protected
-  ImageReader(::javax::imageio::spi::ImageReaderSpi *);
-public:
-  virtual void abort();
-public: // actually protected
-  virtual jboolean abortRequested();
-public:
-  virtual void addIIOReadProgressListener(::javax::imageio::event::IIOReadProgressListener *);
-  virtual void addIIOReadUpdateListener(::javax::imageio::event::IIOReadUpdateListener *);
-  virtual void addIIOReadWarningListener(::javax::imageio::event::IIOReadWarningListener *);
-  virtual jboolean canReadRaster();
-public: // actually protected
-  virtual void clearAbortRequest();
-public:
-  virtual void dispose();
-  virtual jfloat getAspectRatio(jint);
-  virtual JArray< ::java::util::Locale * > * getAvailableLocales();
-  virtual ::javax::imageio::ImageReadParam * getDefaultReadParam();
-  virtual ::java::lang::String * getFormatName();
-  virtual jint getHeight(jint) = 0;
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint) = 0;
-  virtual ::java::util::Iterator * getImageTypes(jint) = 0;
-  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
-  virtual void setInput(::java::lang::Object *, jboolean);
-  virtual void setInput(::java::lang::Object *);
-  virtual ::java::lang::Object * getInput();
-  virtual ::java::util::Locale * getLocale();
-  virtual jint getNumImages(jboolean) = 0;
-  virtual jint getNumThumbnails(jint);
-  virtual ::javax::imageio::spi::ImageReaderSpi * getOriginatingProvider();
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata() = 0;
-  virtual jint getThumbnailHeight(jint, jint);
-  virtual jint getThumbnailWidth(jint, jint);
-  virtual jint getTileGridXOffset(jint);
-  virtual jint getTileGridYOffset(jint);
-  virtual jint getTileHeight(jint);
-  virtual jint getTileWidth(jint);
-  virtual jint getWidth(jint) = 0;
-  virtual jboolean hasThumbnails(jint);
-  virtual jboolean isIgnoringMetadata();
-  virtual jboolean isImageTiled(jint);
-  virtual jboolean isRandomAccessEasy(jint);
-  virtual jboolean isSeekForwardOnly();
-public: // actually protected
-  virtual void processImageComplete();
-  virtual void processImageProgress(jfloat);
-  virtual void processImageStarted(jint);
-  virtual void processImageUpdate(::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void processPassComplete(::java::awt::image::BufferedImage *);
-  virtual void processPassStarted(::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void processReadAborted();
-  virtual void processSequenceComplete();
-  virtual void processSequenceStarted(jint);
-  virtual void processThumbnailComplete();
-  virtual void processThumbnailPassComplete(::java::awt::image::BufferedImage *);
-  virtual void processThumbnailPassStarted(::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void processThumbnailProgress(jfloat);
-  virtual void processThumbnailStarted(jint, jint);
-  virtual void processThumbnailUpdate(::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void processWarningOccurred(::java::lang::String *);
-  virtual void processWarningOccurred(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *) = 0;
-  virtual jboolean readerSupportsThumbnails();
-  virtual ::java::awt::image::Raster * readRaster(jint, ::javax::imageio::ImageReadParam *);
-  virtual ::java::awt::image::BufferedImage * readThumbnail(jint, jint);
-  virtual void removeAllIIOReadProgressListeners();
-  virtual void removeAllIIOReadUpdateListeners();
-  virtual void removeAllIIOReadWarningListeners();
-  virtual void removeIIOReadProgressListener(::javax::imageio::event::IIOReadProgressListener *);
-  virtual void removeIIOReadUpdateListener(::javax::imageio::event::IIOReadUpdateListener *);
-  virtual void removeIIOReadWarningListener(::javax::imageio::event::IIOReadWarningListener *);
-  virtual void setLocale(::java::util::Locale *);
-public: // actually protected
-  static void checkReadParamBandSettings(::javax::imageio::ImageReadParam *, jint, jint);
-  static void computeRegions(::javax::imageio::ImageReadParam *, jint, jint, ::java::awt::image::BufferedImage *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  static ::java::awt::image::BufferedImage * getDestination(::javax::imageio::ImageReadParam *, ::java::util::Iterator *, jint, jint);
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint, ::java::lang::String *, ::java::util::Set *);
-  virtual jint getMinIndex();
-  virtual ::javax::imageio::ImageTypeSpecifier * getRawImageType(jint);
-public: // actually protected
-  static ::java::awt::Rectangle * getSourceRegion(::javax::imageio::ImageReadParam *, jint, jint);
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata(::java::lang::String *, ::java::util::Set *);
-  virtual ::java::awt::image::BufferedImage * read(jint);
-  virtual ::javax::imageio::IIOImage * readAll(jint, ::javax::imageio::ImageReadParam *);
-  virtual ::java::util::Iterator * readAll(::java::util::Iterator *);
-  virtual ::java::awt::image::RenderedImage * readAsRenderedImage(jint, ::javax::imageio::ImageReadParam *);
-  virtual ::java::awt::image::BufferedImage * readTile(jint, jint, jint);
-  virtual ::java::awt::image::Raster * readTileRaster(jint, jint, jint);
-  virtual void reset();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) aborted;
-public: // actually protected
-  JArray< ::java::util::Locale * > * availableLocales;
-  jboolean ignoreMetadata;
-  ::java::lang::Object * input;
-  ::java::util::Locale * locale;
-  jint minIndex;
-  ::javax::imageio::spi::ImageReaderSpi * originatingProvider;
-  ::java::util::List * progressListeners;
-  jboolean seekForwardOnly;
-  ::java::util::List * updateListeners;
-  ::java::util::List * warningListeners;
-  ::java::util::List * warningLocales;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageReader__
diff --git a/libjava/javax/imageio/ImageTranscoder.h b/libjava/javax/imageio/ImageTranscoder.h
deleted file mode 100644
index b3661fdcef2..00000000000
--- a/libjava/javax/imageio/ImageTranscoder.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageTranscoder__
-#define __javax_imageio_ImageTranscoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTranscoder;
-        class ImageTypeSpecifier;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class javax::imageio::ImageTranscoder : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * convertImageMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual ::javax::imageio::metadata::IIOMetadata * convertStreamMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageWriteParam *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_ImageTranscoder__
diff --git a/libjava/javax/imageio/ImageTypeSpecifier.h b/libjava/javax/imageio/ImageTypeSpecifier.h
deleted file mode 100644
index c8a33638beb..00000000000
--- a/libjava/javax/imageio/ImageTypeSpecifier.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageTypeSpecifier__
-#define __javax_imageio_ImageTypeSpecifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class RenderedImage;
-          class SampleModel;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-    }
-  }
-}
-
-class javax::imageio::ImageTypeSpecifier : public ::java::lang::Object
-{
-
-public:
-  ImageTypeSpecifier(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *);
-  ImageTypeSpecifier(::java::awt::image::RenderedImage *);
-  static ::javax::imageio::ImageTypeSpecifier * createBanded(::java::awt::color::ColorSpace *, JArray< jint > *, JArray< jint > *, jint, jboolean, jboolean);
-  virtual ::java::awt::image::BufferedImage * createBufferedImage(jint, jint);
-  static ::javax::imageio::ImageTypeSpecifier * createFromBufferedImageType(jint);
-  static ::javax::imageio::ImageTypeSpecifier * createFromRenderedImage(::java::awt::image::RenderedImage *);
-  static ::javax::imageio::ImageTypeSpecifier * createGrayscale(jint, jint, jboolean);
-  static ::javax::imageio::ImageTypeSpecifier * createGrayscale(jint, jint, jboolean, jboolean);
-  static ::javax::imageio::ImageTypeSpecifier * createIndexed(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, jint, jint);
-  static ::javax::imageio::ImageTypeSpecifier * createInterleaved(::java::awt::color::ColorSpace *, JArray< jint > *, jint, jboolean, jboolean);
-  static ::javax::imageio::ImageTypeSpecifier * createPacked(::java::awt::color::ColorSpace *, jint, jint, jint, jint, jint, jboolean);
-  virtual jint getBitsPerBand(jint);
-  virtual jint getBufferedImageType();
-  virtual ::java::awt::image::SampleModel * getSampleModel(jint, jint);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual jint getNumBands();
-  virtual jint getNumComponents();
-  virtual ::java::awt::image::SampleModel * getSampleModel();
-public: // actually protected
-  ::java::awt::image::ColorModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) colorModel;
-  ::java::awt::image::SampleModel * sampleModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageTypeSpecifier__
diff --git a/libjava/javax/imageio/ImageWriteParam.h b/libjava/javax/imageio/ImageWriteParam.h
deleted file mode 100644
index 100a3e5f962..00000000000
--- a/libjava/javax/imageio/ImageWriteParam.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageWriteParam__
-#define __javax_imageio_ImageWriteParam__
-
-#pragma interface
-
-#include <javax/imageio/IIOParam.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageWriteParam;
-    }
-  }
-}
-
-class javax::imageio::ImageWriteParam : public ::javax::imageio::IIOParam
-{
-
-public: // actually protected
-  ImageWriteParam();
-public:
-  ImageWriteParam(::java::util::Locale *);
-  virtual jfloat getBitRate(jfloat);
-private:
-  void checkSupportsCompression();
-  void checkNotExplicitCompression();
-  void checkCompressionTypesSet();
-  void checkSupportsProgressiveEncoding();
-  void checkSupportsTiling();
-  void checkNotExplicitTiling();
-  void checkTilingInitialized();
-  void checkMode(jint);
-public:
-  virtual jboolean canOffsetTiles();
-  virtual jboolean canWriteCompressed();
-  virtual jboolean canWriteProgressive();
-  virtual jboolean canWriteTiles();
-  virtual jint getCompressionMode();
-  virtual jfloat getCompressionQuality();
-  virtual JArray< ::java::lang::String * > * getCompressionQualityDescriptions();
-  virtual JArray< jfloat > * getCompressionQualityValues();
-  virtual ::java::lang::String * getCompressionType();
-  virtual JArray< ::java::lang::String * > * getCompressionTypes();
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::lang::String * getLocalizedCompressionTypeName();
-  virtual JArray< ::java::awt::Dimension * > * getPreferredTileSizes();
-  virtual jint getProgressiveMode();
-  virtual jint getTileGridXOffset();
-  virtual jint getTileGridYOffset();
-  virtual jint getTileHeight();
-  virtual jint getTileWidth();
-  virtual jint getTilingMode();
-  virtual jboolean isCompressionLossless();
-  virtual void setCompressionMode(jint);
-  virtual void setCompressionQuality(jfloat);
-  virtual void setCompressionType(::java::lang::String *);
-  virtual void setProgressiveMode(jint);
-  virtual void setTiling(jint, jint, jint, jint);
-  virtual void setTilingMode(jint);
-  virtual void unsetCompression();
-  virtual void unsetTiling();
-  static const jint MODE_DISABLED = 0;
-  static const jint MODE_DEFAULT = 1;
-  static const jint MODE_EXPLICIT = 2;
-  static const jint MODE_COPY_FROM_METADATA = 3;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::imageio::IIOParam)))) canOffsetTiles__;
-  jboolean canWriteCompressed__;
-  jboolean canWriteProgressive__;
-  jboolean canWriteTiles__;
-  jint compressionMode;
-  jfloat compressionQuality;
-  ::java::lang::String * compressionType;
-  JArray< ::java::lang::String * > * compressionTypes;
-  ::java::util::Locale * locale;
-  JArray< ::java::awt::Dimension * > * preferredTileSizes;
-  jint progressiveMode;
-  jint tileGridXOffset;
-  jint tileGridYOffset;
-  jint tileHeight;
-  jint tileWidth;
-  jint tilingMode;
-  jboolean tilingSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageWriteParam__
diff --git a/libjava/javax/imageio/ImageWriter.h b/libjava/javax/imageio/ImageWriter.h
deleted file mode 100644
index db14cbdde5d..00000000000
--- a/libjava/javax/imageio/ImageWriter.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageWriter__
-#define __javax_imageio_ImageWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-      namespace image
-      {
-          class Raster;
-          class RenderedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageTypeSpecifier;
-        class ImageWriteParam;
-        class ImageWriter;
-      namespace event
-      {
-          class IIOWriteProgressListener;
-          class IIOWriteWarningListener;
-      }
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace spi
-      {
-          class ImageWriterSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::ImageWriter : public ::java::lang::Object
-{
-
-public: // actually protected
-  ImageWriter(::javax::imageio::spi::ImageWriterSpi *);
-private:
-  void checkOutputSet();
-public:
-  virtual void abort();
-public: // actually protected
-  virtual jboolean abortRequested();
-public:
-  virtual void addIIOWriteProgressListener(::javax::imageio::event::IIOWriteProgressListener *);
-  virtual void addIIOWriteWarningListener(::javax::imageio::event::IIOWriteWarningListener *);
-  virtual jboolean canInsertEmpty(jint);
-  virtual jboolean canInsertImage(jint);
-  virtual jboolean canRemoveImage(jint);
-  virtual jboolean canReplaceImageMetadata(jint);
-  virtual jboolean canReplacePixels(jint);
-  virtual jboolean canReplaceStreamMetadata();
-  virtual jboolean canWriteEmpty();
-  virtual jboolean canWriteRasters();
-  virtual jboolean canWriteSequence();
-public: // actually protected
-  virtual void clearAbortRequest();
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * convertImageMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual ::javax::imageio::metadata::IIOMetadata * convertStreamMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual void dispose();
-  virtual JArray< ::java::util::Locale * > * getAvailableLocales();
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultImageMetadata(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultStreamMetadata(::javax::imageio::ImageWriteParam *) = 0;
-  virtual ::javax::imageio::ImageWriteParam * getDefaultWriteParam();
-  virtual ::java::util::Locale * getLocale();
-  virtual jint getNumThumbnailsSupported(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::metadata::IIOMetadata *);
-  virtual ::javax::imageio::spi::ImageWriterSpi * getOriginatingProvider();
-  virtual ::java::lang::Object * getOutput();
-  virtual JArray< ::java::awt::Dimension * > * getPreferredThumbnailSizes(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::metadata::IIOMetadata *);
-public: // actually protected
-  virtual void processImageComplete();
-  virtual void processImageProgress(jfloat);
-  virtual void processImageStarted(jint);
-  virtual void processThumbnailComplete();
-  virtual void processThumbnailProgress(jfloat);
-  virtual void processThumbnailStarted(jint, jint);
-  virtual void processWarningOccurred(jint, ::java::lang::String *);
-  virtual void processWarningOccurred(jint, ::java::lang::String *, ::java::lang::String *);
-  virtual void processWriteAborted();
-public:
-  virtual void removeAllIIOWriteProgressListeners();
-  virtual void removeAllIIOWriteWarningListeners();
-  virtual void removeIIOWriteProgressListener(::javax::imageio::event::IIOWriteProgressListener *);
-  virtual void removeIIOWriteWarningListener(::javax::imageio::event::IIOWriteWarningListener *);
-  virtual void reset();
-  virtual void setLocale(::java::util::Locale *);
-  virtual void setOutput(::java::lang::Object *);
-  virtual void write(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual void endInsertEmpty();
-  virtual void endReplacePixels();
-  virtual void endWriteEmpty();
-  virtual void endWriteSequence();
-  virtual void prepareInsertEmpty(jint, ::javax::imageio::ImageTypeSpecifier *, jint, jint, ::javax::imageio::metadata::IIOMetadata *, ::java::util::List *, ::javax::imageio::ImageWriteParam *);
-  virtual void prepareReplacePixels(jint, ::java::awt::Rectangle *);
-  virtual void prepareWriteEmpty(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, jint, jint, ::javax::imageio::metadata::IIOMetadata *, ::java::util::List *, ::javax::imageio::ImageWriteParam *);
-  virtual void prepareWriteSequence(::javax::imageio::metadata::IIOMetadata *);
-  virtual void removeImage(jint);
-  virtual void replaceImageMetadata(jint, ::javax::imageio::metadata::IIOMetadata *);
-  virtual void replacePixels(::java::awt::image::RenderedImage *, ::javax::imageio::ImageWriteParam *);
-  virtual void replacePixels(::java::awt::image::Raster *, ::javax::imageio::ImageWriteParam *);
-  virtual void replaceStreamMetadata(::javax::imageio::metadata::IIOMetadata *);
-  virtual void write(::java::awt::image::RenderedImage *);
-  virtual void write(::javax::imageio::IIOImage *);
-  virtual void writeInsert(jint, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-  virtual void writeToSequence(::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) aborted;
-public: // actually protected
-  JArray< ::java::util::Locale * > * availableLocales;
-  ::java::util::Locale * locale;
-  ::javax::imageio::spi::ImageWriterSpi * originatingProvider;
-  ::java::lang::Object * output;
-  ::java::util::List * progressListeners;
-  ::java::util::List * warningListeners;
-  ::java::util::List * warningLocales;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageWriter__
diff --git a/libjava/javax/imageio/event/IIOReadProgressListener.h b/libjava/javax/imageio/event/IIOReadProgressListener.h
deleted file mode 100644
index 3bad67116b7..00000000000
--- a/libjava/javax/imageio/event/IIOReadProgressListener.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOReadProgressListener__
-#define __javax_imageio_event_IIOReadProgressListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace event
-      {
-          class IIOReadProgressListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOReadProgressListener : public ::java::lang::Object
-{
-
-public:
-  virtual void imageComplete(::javax::imageio::ImageReader *) = 0;
-  virtual void imageProgress(::javax::imageio::ImageReader *, jfloat) = 0;
-  virtual void imageStarted(::javax::imageio::ImageReader *, jint) = 0;
-  virtual void readAborted(::javax::imageio::ImageReader *) = 0;
-  virtual void sequenceComplete(::javax::imageio::ImageReader *) = 0;
-  virtual void sequenceStarted(::javax::imageio::ImageReader *, jint) = 0;
-  virtual void thumbnailComplete(::javax::imageio::ImageReader *) = 0;
-  virtual void thumbnailProgress(::javax::imageio::ImageReader *, jfloat) = 0;
-  virtual void thumbnailStarted(::javax::imageio::ImageReader *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOReadProgressListener__
diff --git a/libjava/javax/imageio/event/IIOReadUpdateListener.h b/libjava/javax/imageio/event/IIOReadUpdateListener.h
deleted file mode 100644
index 86c28ec700b..00000000000
--- a/libjava/javax/imageio/event/IIOReadUpdateListener.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOReadUpdateListener__
-#define __javax_imageio_event_IIOReadUpdateListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace event
-      {
-          class IIOReadUpdateListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOReadUpdateListener : public ::java::lang::Object
-{
-
-public:
-  virtual void imageUpdate(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, JArray< jint > *) = 0;
-  virtual void passComplete(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *) = 0;
-  virtual void passStarted(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, jint, JArray< jint > *) = 0;
-  virtual void thumbnailPassComplete(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *) = 0;
-  virtual void thumbnailPassStarted(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, jint, JArray< jint > *) = 0;
-  virtual void thumbnailUpdate(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, JArray< jint > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOReadUpdateListener__
diff --git a/libjava/javax/imageio/event/IIOReadWarningListener.h b/libjava/javax/imageio/event/IIOReadWarningListener.h
deleted file mode 100644
index c74cf41d719..00000000000
--- a/libjava/javax/imageio/event/IIOReadWarningListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOReadWarningListener__
-#define __javax_imageio_event_IIOReadWarningListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace event
-      {
-          class IIOReadWarningListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOReadWarningListener : public ::java::lang::Object
-{
-
-public:
-  virtual void warningOccurred(::javax::imageio::ImageReader *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOReadWarningListener__
diff --git a/libjava/javax/imageio/event/IIOWriteProgressListener.h b/libjava/javax/imageio/event/IIOWriteProgressListener.h
deleted file mode 100644
index bb140af3565..00000000000
--- a/libjava/javax/imageio/event/IIOWriteProgressListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOWriteProgressListener__
-#define __javax_imageio_event_IIOWriteProgressListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageWriter;
-      namespace event
-      {
-          class IIOWriteProgressListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOWriteProgressListener : public ::java::lang::Object
-{
-
-public:
-  virtual void imageComplete(::javax::imageio::ImageWriter *) = 0;
-  virtual void imageProgress(::javax::imageio::ImageWriter *, jfloat) = 0;
-  virtual void imageStarted(::javax::imageio::ImageWriter *, jint) = 0;
-  virtual void thumbnailComplete(::javax::imageio::ImageWriter *) = 0;
-  virtual void thumbnailProgress(::javax::imageio::ImageWriter *, jfloat) = 0;
-  virtual void thumbnailStarted(::javax::imageio::ImageWriter *, jint, jint) = 0;
-  virtual void writeAborted(::javax::imageio::ImageWriter *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOWriteProgressListener__
diff --git a/libjava/javax/imageio/event/IIOWriteWarningListener.h b/libjava/javax/imageio/event/IIOWriteWarningListener.h
deleted file mode 100644
index 220bf2321e5..00000000000
--- a/libjava/javax/imageio/event/IIOWriteWarningListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOWriteWarningListener__
-#define __javax_imageio_event_IIOWriteWarningListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageWriter;
-      namespace event
-      {
-          class IIOWriteWarningListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOWriteWarningListener : public ::java::lang::Object
-{
-
-public:
-  virtual void warningOccurred(::javax::imageio::ImageWriter *, jint, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOWriteWarningListener__
diff --git a/libjava/javax/imageio/metadata/IIOInvalidTreeException.h b/libjava/javax/imageio/metadata/IIOInvalidTreeException.h
deleted file mode 100644
index 9980defda65..00000000000
--- a/libjava/javax/imageio/metadata/IIOInvalidTreeException.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOInvalidTreeException__
-#define __javax_imageio_metadata_IIOInvalidTreeException__
-
-#pragma interface
-
-#include <javax/imageio/IIOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOInvalidTreeException;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOInvalidTreeException : public ::javax::imageio::IIOException
-{
-
-public:
-  IIOInvalidTreeException(::java::lang::String *, ::org::w3c::dom::Node *);
-  IIOInvalidTreeException(::java::lang::String *, ::java::lang::Throwable *, ::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * getOffendingNode();
-private:
-  static const jlong serialVersionUID = -1314083172544132777LL;
-public: // actually protected
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::javax::imageio::IIOException)))) offendingNode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOInvalidTreeException__
diff --git a/libjava/javax/imageio/metadata/IIOMetadata.h b/libjava/javax/imageio/metadata/IIOMetadata.h
deleted file mode 100644
index 33d5a61646f..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadata.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadata__
-#define __javax_imageio_metadata_IIOMetadata__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadata;
-          class IIOMetadataController;
-          class IIOMetadataFormat;
-          class IIOMetadataNode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadata : public ::java::lang::Object
-{
-
-public: // actually protected
-  IIOMetadata();
-  IIOMetadata(jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-public:
-  virtual jboolean activateController();
-  virtual ::javax::imageio::metadata::IIOMetadataController * getController();
-  virtual ::javax::imageio::metadata::IIOMetadataController * getDefaultController();
-  virtual JArray< ::java::lang::String * > * getExtraMetadataFormatNames();
-  virtual ::javax::imageio::metadata::IIOMetadataFormat * getMetadataFormat(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getMetadataFormatNames();
-  virtual ::java::lang::String * getNativeMetadataFormatName();
-  virtual jboolean hasController();
-  virtual jboolean isReadOnly() = 0;
-  virtual jboolean isStandardMetadataFormatSupported();
-  virtual void reset() = 0;
-  virtual void setController(::javax::imageio::metadata::IIOMetadataController *);
-  virtual ::org::w3c::dom::Node * getAsTree(::java::lang::String *) = 0;
-public: // actually protected
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardChromaNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardCompressionNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardDataNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardDimensionNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardDocumentNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardTextNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardTileNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardTransparencyNode();
-private:
-  void appendChild(::javax::imageio::metadata::IIOMetadataNode *, ::javax::imageio::metadata::IIOMetadataNode *);
-public: // actually protected
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardTree();
-public:
-  virtual void mergeTree(::java::lang::String *, ::org::w3c::dom::Node *) = 0;
-  virtual void setFromTree(::java::lang::String *, ::org::w3c::dom::Node *);
-public: // actually protected
-  ::javax::imageio::metadata::IIOMetadataController * __attribute__((aligned(__alignof__( ::java::lang::Object)))) controller;
-  ::javax::imageio::metadata::IIOMetadataController * defaultController;
-  JArray< ::java::lang::String * > * extraMetadataFormatClassNames;
-  JArray< ::java::lang::String * > * extraMetadataFormatNames;
-  ::java::lang::String * nativeMetadataFormatClassName;
-  ::java::lang::String * nativeMetadataFormatName;
-  jboolean standardFormatSupported;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadata__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataController.h b/libjava/javax/imageio/metadata/IIOMetadataController.h
deleted file mode 100644
index e970191d67e..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataController__
-#define __javax_imageio_metadata_IIOMetadataController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadata;
-          class IIOMetadataController;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataController : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean activate(::javax::imageio::metadata::IIOMetadata *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_metadata_IIOMetadataController__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormat.h b/libjava/javax/imageio/metadata/IIOMetadataFormat.h
deleted file mode 100644
index 0744efbfcae..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormat.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormat__
-#define __javax_imageio_metadata_IIOMetadataFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-      namespace metadata
-      {
-          class IIOMetadataFormat;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormat : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean canNodeAppear(::java::lang::String *, ::javax::imageio::ImageTypeSpecifier *) = 0;
-  virtual jint getAttributeDataType(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeDefaultValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeDescription(::java::lang::String *, ::java::lang::String *, ::java::util::Locale *) = 0;
-  virtual JArray< ::java::lang::String * > * getAttributeEnumerations(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getAttributeListMaxLength(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getAttributeListMinLength(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeMaxValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeMinValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getAttributeNames(::java::lang::String *) = 0;
-  virtual jint getAttributeValueType(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getChildNames(::java::lang::String *) = 0;
-  virtual jint getChildPolicy(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getElementDescription(::java::lang::String *, ::java::util::Locale *) = 0;
-  virtual jint getElementMaxChildren(::java::lang::String *) = 0;
-  virtual jint getElementMinChildren(::java::lang::String *) = 0;
-  virtual jint getObjectArrayMaxLength(::java::lang::String *) = 0;
-  virtual jint getObjectArrayMinLength(::java::lang::String *) = 0;
-  virtual ::java::lang::Class * getObjectClass(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * getObjectDefaultValue(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::Object * > * getObjectEnumerations(::java::lang::String *) = 0;
-  virtual ::java::lang::Comparable * getObjectMaxValue(::java::lang::String *) = 0;
-  virtual ::java::lang::Comparable * getObjectMinValue(::java::lang::String *) = 0;
-  virtual jint getObjectValueType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRootName() = 0;
-  virtual jboolean isAttributeRequired(::java::lang::String *, ::java::lang::String *) = 0;
-  static const jint CHILD_POLICY_ALL = 1;
-  static const jint CHILD_POLICY_CHOICE = 3;
-  static const jint CHILD_POLICY_EMPTY = 0;
-  static const jint CHILD_POLICY_MAX = 5;
-  static const jint CHILD_POLICY_REPEAT = 5;
-  static const jint CHILD_POLICY_SEQUENCE = 4;
-  static const jint CHILD_POLICY_SOME = 2;
-  static const jint DATATYPE_BOOLEAN = 1;
-  static const jint DATATYPE_DOUBLE = 4;
-  static const jint DATATYPE_FLOAT = 3;
-  static const jint DATATYPE_INTEGER = 2;
-  static const jint DATATYPE_STRING = 0;
-  static const jint VALUE_ARBITRARY = 1;
-  static const jint VALUE_ENUMERATION = 16;
-  static const jint VALUE_LIST = 32;
-  static const jint VALUE_NONE = 0;
-  static const jint VALUE_RANGE = 2;
-  static const jint VALUE_RANGE_MAX_INCLUSIVE = 10;
-  static const jint VALUE_RANGE_MAX_INCLUSIVE_MASK = 8;
-  static const jint VALUE_RANGE_MIN_INCLUSIVE = 6;
-  static const jint VALUE_RANGE_MIN_INCLUSIVE_MASK = 4;
-  static const jint VALUE_RANGE_MIN_MAX_INCLUSIVE = 14;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_metadata_IIOMetadataFormat__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$1.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$1.h
deleted file mode 100644
index ade1fa0c7ce..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$1__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$1__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl$1;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$1 : public ::javax::imageio::metadata::IIOMetadataFormatImpl
-{
-
-public: // actually package-private
-  IIOMetadataFormatImpl$1(::java::lang::String *, jint);
-public:
-  virtual jboolean canNodeAppear(::java::lang::String *, ::javax::imageio::ImageTypeSpecifier *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$1__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h
deleted file mode 100644
index e1f5f93a413..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttr__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttr__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataNode.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl$IIOMetadataNodeAttr;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr : public ::javax::imageio::metadata::IIOMetadataNode
-{
-
-public:
-  IIOMetadataFormatImpl$IIOMetadataNodeAttr(::org::w3c::dom::Element *, ::java::lang::String *, ::java::lang::String *);
-  IIOMetadataFormatImpl$IIOMetadataNodeAttr(::org::w3c::dom::Element *, ::java::lang::String *, jint, jboolean, ::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::org::w3c::dom::Element * getOwnerElement();
-  virtual jint getDataType();
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo();
-  virtual jboolean getSpecified();
-  virtual ::java::lang::String * getValue();
-  virtual jboolean isId();
-  virtual void setValue(::java::lang::String *);
-  virtual jboolean isRequired();
-public: // actually protected
-  ::org::w3c::dom::Element * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataNode)))) owner;
-  ::java::lang::String * name;
-  jint dataType;
-  jboolean required;
-  ::java::lang::String * defaultValue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttr__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.h
deleted file mode 100644
index 4a1a76e76bc..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded : public ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr
-{
-
-public:
-  IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::String *, jint, jboolean, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  virtual ::java::lang::String * getMinValue();
-  virtual ::java::lang::String * getMaxValue();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr)))) minValue;
-  ::java::lang::String * maxValue;
-  jboolean minInclusive;
-  jboolean maxInclusive;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.h
deleted file mode 100644
index a81c5628941..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated : public ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr
-{
-
-public:
-  IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::String *, jint, jboolean, ::java::lang::String *, ::java::util::List *);
-  virtual JArray< ::java::lang::Object * > * getEnumerations();
-public: // actually protected
-  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr)))) enumeratedValues;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.h
deleted file mode 100644
index fd5b373cb01..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrList__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrList__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$IIOMetadataNodeAttrList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttrList : public ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr
-{
-
-public:
-  IIOMetadataFormatImpl$IIOMetadataNodeAttrList(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::String *, jint, jboolean, jint, jint);
-  virtual jint getListMinLength();
-  virtual jint getListMaxLength();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr)))) listMinLength;
-  jint listMaxLength;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrList__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h
deleted file mode 100644
index fabfef49165..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObject__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObject;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject : public ::java::lang::Object
-{
-
-public:
-  IIOMetadataFormatImpl$NodeObject(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::Class *, jboolean, ::java::lang::Object *);
-  virtual jint getValueType();
-  virtual ::java::lang::Class * getClassType();
-  virtual ::org::w3c::dom::Element * getOwnerElement();
-  virtual ::java::lang::Object * getDefaultValue();
-  virtual jboolean isRequired();
-public: // actually protected
-  ::org::w3c::dom::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) owner;
-  ::java::lang::Class * classType;
-  jboolean required;
-  ::java::lang::Object * defaultValue;
-  jint valueType;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObject__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.h
deleted file mode 100644
index 4e9b819ed5b..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectArray__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectArray__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObjectArray;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$NodeObjectArray : public ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject
-{
-
-public:
-  IIOMetadataFormatImpl$NodeObjectArray(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::Class *, jint, jint);
-  virtual ::java::lang::Comparable * getArrayMinLength();
-  virtual ::java::lang::Comparable * getArrayMaxLength();
-public: // actually protected
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject)))) arrayMinLength;
-  ::java::lang::Integer * arrayMaxLength;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectArray__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.h
deleted file mode 100644
index 1605d23deb9..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectBounded__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectBounded__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObjectBounded;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$NodeObjectBounded : public ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject
-{
-
-public:
-  IIOMetadataFormatImpl$NodeObjectBounded(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::Class *, ::java::lang::Object *, ::java::lang::Comparable *, ::java::lang::Comparable *, jboolean, jboolean);
-  virtual ::java::lang::Comparable * getMinValue();
-  virtual ::java::lang::Comparable * getMaxValue();
-public: // actually protected
-  ::java::lang::Comparable * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject)))) minValue;
-  ::java::lang::Comparable * maxValue;
-  jboolean minInclusive;
-  jboolean maxInclusive;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectBounded__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.h
deleted file mode 100644
index 0dabd83e265..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectEnumerated__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectEnumerated__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObjectEnumerated;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$NodeObjectEnumerated : public ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject
-{
-
-public:
-  IIOMetadataFormatImpl$NodeObjectEnumerated(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::Class *, jboolean, ::java::lang::Object *, ::java::util::List *);
-  virtual JArray< ::java::lang::Object * > * getEnumerations();
-public: // actually protected
-  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject)))) enumeratedValues;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectEnumerated__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl.h
deleted file mode 100644
index b47defa8474..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-      namespace metadata
-      {
-          class IIOMetadataFormat;
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObject;
-          class IIOMetadataNode;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl : public ::java::lang::Object
-{
-
-public:
-  IIOMetadataFormatImpl(::java::lang::String *, jint);
-  IIOMetadataFormatImpl(::java::lang::String *, jint, jint);
-public: // actually protected
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, jint, jboolean, ::java::lang::String *);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, jint, jboolean, ::java::lang::String *, ::java::util::List *);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, jint, jboolean, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, jint, jboolean, jint, jint);
-  virtual void addBooleanAttribute(::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  virtual void addChildElement(::java::lang::String *, ::java::lang::String *);
-  virtual void addElement(::java::lang::String *, ::java::lang::String *, jint);
-  virtual void addElement(::java::lang::String *, ::java::lang::String *, jint, jint);
-private:
-  void addNodeObject(::javax::imageio::metadata::IIOMetadataNode *, ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject *);
-  ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject * getNodeObject(::javax::imageio::metadata::IIOMetadataNode *);
-  void removeNodeObject(::javax::imageio::metadata::IIOMetadataNode *);
-public: // actually protected
-  virtual void addObjectValue(::java::lang::String *, ::java::lang::Class *, jboolean, ::java::lang::Object *);
-  virtual void addObjectValue(::java::lang::String *, ::java::lang::Class *, jboolean, ::java::lang::Object *, ::java::util::List *);
-  virtual void addObjectValue(::java::lang::String *, ::java::lang::Class *, ::java::lang::Object *, ::java::lang::Comparable *, ::java::lang::Comparable *, jboolean, jboolean);
-  virtual void addObjectValue(::java::lang::String *, ::java::lang::Class *, jint, jint);
-public:
-  virtual ::java::lang::String * getRootName();
-public: // actually protected
-  virtual ::java::lang::String * getResourceBaseName();
-public:
-  static ::javax::imageio::metadata::IIOMetadataFormat * getStandardFormatInstance();
-  virtual jboolean canNodeAppear(::java::lang::String *, ::javax::imageio::ImageTypeSpecifier *) = 0;
-public: // actually protected
-  virtual void removeAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual void removeElement(::java::lang::String *);
-  virtual void removeObjectValue(::java::lang::String *);
-  virtual void setResourceBaseName(::java::lang::String *);
-public:
-  virtual jint getAttributeDataType(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeDefaultValue(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeDescription(::java::lang::String *, ::java::lang::String *, ::java::util::Locale *);
-  virtual JArray< ::java::lang::String * > * getAttributeEnumerations(::java::lang::String *, ::java::lang::String *);
-  virtual jint getAttributeListMaxLength(::java::lang::String *, ::java::lang::String *);
-  virtual jint getAttributeListMinLength(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeMaxValue(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeMinValue(::java::lang::String *, ::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getAttributeNames(::java::lang::String *);
-  virtual jint getAttributeValueType(::java::lang::String *, ::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getChildNames(::java::lang::String *);
-  virtual jint getChildPolicy(::java::lang::String *);
-private:
-  ::java::lang::String * getDescription(::java::lang::String *, ::java::util::Locale *);
-public:
-  virtual ::java::lang::String * getElementDescription(::java::lang::String *, ::java::util::Locale *);
-  virtual jint getElementMaxChildren(::java::lang::String *);
-  virtual jint getElementMinChildren(::java::lang::String *);
-  virtual jint getObjectArrayMaxLength(::java::lang::String *);
-  virtual jint getObjectArrayMinLength(::java::lang::String *);
-  virtual ::java::lang::Class * getObjectClass(::java::lang::String *);
-  virtual ::java::lang::Object * getObjectDefaultValue(::java::lang::String *);
-  virtual JArray< ::java::lang::Object * > * getObjectEnumerations(::java::lang::String *);
-  virtual ::java::lang::Comparable * getObjectMaxValue(::java::lang::String *);
-  virtual ::java::lang::Comparable * getObjectMinValue(::java::lang::String *);
-  virtual jint getObjectValueType(::java::lang::String *);
-  virtual jboolean isAttributeRequired(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * standardMetadataFormatName;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rootName;
-  ::java::util::Map * nodes;
-  ::java::util::Map * childPolicies;
-  ::java::util::Map * childRanges;
-  ::java::lang::String * resourceBaseName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.h b/libjava/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.h
deleted file mode 100644
index 9026a27d65f..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataNode$IIONamedNodeMap__
-#define __javax_imageio_metadata_IIOMetadataNode$IIONamedNodeMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataNode;
-          class IIOMetadataNode$IIONamedNodeMap;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataNode$IIONamedNodeMap : public ::java::lang::Object
-{
-
-public:
-  IIOMetadataNode$IIONamedNodeMap(::javax::imageio::metadata::IIOMetadataNode *, ::java::util::HashMap *);
-  virtual ::org::w3c::dom::Node * getNamedItem(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * setNamedItem(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * removeNamedItem(::java::lang::String *);
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual jint getLength();
-  virtual ::org::w3c::dom::Node * getNamedItemNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Node * setNamedItemNS(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * removeNamedItemNS(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrs;
-  ::javax::imageio::metadata::IIOMetadataNode * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataNode$IIONamedNodeMap__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataNode$IIONodeList.h b/libjava/javax/imageio/metadata/IIOMetadataNode$IIONodeList.h
deleted file mode 100644
index 581abd9cab8..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataNode$IIONodeList.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataNode$IIONodeList__
-#define __javax_imageio_metadata_IIOMetadataNode$IIONodeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataNode;
-          class IIOMetadataNode$IIONodeList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataNode$IIONodeList : public ::java::lang::Object
-{
-
-  IIOMetadataNode$IIONodeList(::javax::imageio::metadata::IIOMetadataNode *);
-public:
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual jint getLength();
-public: // actually package-private
-  IIOMetadataNode$IIONodeList(::javax::imageio::metadata::IIOMetadataNode *, ::javax::imageio::metadata::IIOMetadataNode$IIONodeList *);
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
-  ::javax::imageio::metadata::IIOMetadataNode * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataNode$IIONodeList__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataNode.h b/libjava/javax/imageio/metadata/IIOMetadataNode.h
deleted file mode 100644
index bf2c50c5381..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataNode.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataNode__
-#define __javax_imageio_metadata_IIOMetadataNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataNode;
-          class IIOMetadataNode$IIONodeList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataNode : public ::java::lang::Object
-{
-
-public:
-  IIOMetadataNode();
-  IIOMetadataNode(::java::lang::String *);
-  virtual ::java::lang::Object * getUserObject();
-  virtual void setUserObject(::java::lang::Object *);
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *);
-  virtual ::java::lang::String * getAttribute(::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getBaseURI();
-private:
-  void getElementsRecurse(::javax::imageio::metadata::IIOMetadataNode$IIONodeList *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *);
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getTagName();
-  virtual jboolean hasAttribute(::java::lang::String *);
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual void removeAttribute(::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *);
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *);
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *);
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual jint getLength();
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean);
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes();
-  virtual ::org::w3c::dom::NodeList * getChildNodes();
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Node * getFirstChild();
-  virtual ::org::w3c::dom::Node * getLastChild();
-  virtual ::java::lang::String * getLocalName();
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::org::w3c::dom::Node * getNextSibling();
-  virtual ::java::lang::String * getNodeName();
-  virtual jshort getNodeType();
-  virtual ::java::lang::String * getNodeValue();
-  virtual ::org::w3c::dom::Document * getOwnerDocument();
-  virtual ::org::w3c::dom::Node * getParentNode();
-  virtual ::java::lang::String * getPrefix();
-  virtual ::org::w3c::dom::Node * getPreviousSibling();
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo();
-  virtual ::java::lang::String * getTextContent();
-  virtual ::java::lang::Object * getUserData(::java::lang::String *);
-  virtual jboolean hasAttributes();
-  virtual jboolean hasChildNodes();
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual jboolean isDefaultNamespace(::java::lang::String *);
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *);
-  virtual jboolean isSameNode(::org::w3c::dom::Node *);
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *);
-  virtual void normalize();
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual void setIdAttribute(::java::lang::String *, jboolean);
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean);
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual void setNodeValue(::java::lang::String *);
-  virtual void setPrefix(::java::lang::String *);
-  virtual void setTextContent(::java::lang::String *);
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::util::HashMap * attrs;
-  ::java::util::List * children;
-  ::javax::imageio::metadata::IIOMetadataNode * parent;
-  ::java::lang::Object * obj;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataNode__
diff --git a/libjava/javax/imageio/plugins/bmp/BMPImageWriteParam.h b/libjava/javax/imageio/plugins/bmp/BMPImageWriteParam.h
deleted file mode 100644
index d1757850d02..00000000000
--- a/libjava/javax/imageio/plugins/bmp/BMPImageWriteParam.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_bmp_BMPImageWriteParam__
-#define __javax_imageio_plugins_bmp_BMPImageWriteParam__
-
-#pragma interface
-
-#include <javax/imageio/ImageWriteParam.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace bmp
-        {
-            class BMPImageWriteParam;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::bmp::BMPImageWriteParam : public ::javax::imageio::ImageWriteParam
-{
-
-public:
-  BMPImageWriteParam();
-  BMPImageWriteParam(::java::util::Locale *);
-  virtual void setTopDown(jboolean);
-  virtual jboolean isTopDown();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::imageio::ImageWriteParam)))) topDown;
-public: // actually package-private
-  ::java::lang::String * rgb;
-  ::java::lang::String * rle8;
-  ::java::lang::String * rle4;
-  ::java::lang::String * bitfields;
-  static const jint BI_RGB = 0;
-  static const jint BI_RLE8 = 1;
-  static const jint BI_RLE4 = 2;
-  static const jint BI_BITFIELDS = 3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_bmp_BMPImageWriteParam__
diff --git a/libjava/javax/imageio/plugins/jpeg/JPEGHuffmanTable.h b/libjava/javax/imageio/plugins/jpeg/JPEGHuffmanTable.h
deleted file mode 100644
index 7aa9f84e54c..00000000000
--- a/libjava/javax/imageio/plugins/jpeg/JPEGHuffmanTable.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_jpeg_JPEGHuffmanTable__
-#define __javax_imageio_plugins_jpeg_JPEGHuffmanTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::jpeg::JPEGHuffmanTable : public ::java::lang::Object
-{
-
-public:
-  JPEGHuffmanTable(JArray< jshort > *, JArray< jshort > *);
-private:
-  JPEGHuffmanTable(JArray< jshort > *, JArray< jshort > *, jboolean);
-  static JArray< jshort > * checkLengths(JArray< jshort > *);
-  static JArray< jshort > * checkValues(JArray< jshort > *, JArray< jshort > *);
-public:
-  virtual JArray< jshort > * getLengths();
-  virtual JArray< jshort > * getValues();
-  virtual ::java::lang::String * toString();
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lengths;
-  JArray< jshort > * values;
-public:
-  static ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * StdACChrominance;
-  static ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * StdACLuminance;
-  static ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * StdDCChrominance;
-  static ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * StdDCLuminance;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_jpeg_JPEGHuffmanTable__
diff --git a/libjava/javax/imageio/plugins/jpeg/JPEGImageReadParam.h b/libjava/javax/imageio/plugins/jpeg/JPEGImageReadParam.h
deleted file mode 100644
index c4583821519..00000000000
--- a/libjava/javax/imageio/plugins/jpeg/JPEGImageReadParam.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_jpeg_JPEGImageReadParam__
-#define __javax_imageio_plugins_jpeg_JPEGImageReadParam__
-
-#pragma interface
-
-#include <javax/imageio/ImageReadParam.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-            class JPEGImageReadParam;
-            class JPEGQTable;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::jpeg::JPEGImageReadParam : public ::javax::imageio::ImageReadParam
-{
-
-public:
-  JPEGImageReadParam();
-  virtual jboolean areTablesSet();
-  virtual void setDecodeTables(JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > *, JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > *, JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > *);
-  virtual void unsetDecodeTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * getQTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * getDCHuffmanTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * getACHuffmanTables();
-private:
-  JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReadParam)))) qTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * DCHuffmanTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * ACHuffmanTables;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_jpeg_JPEGImageReadParam__
diff --git a/libjava/javax/imageio/plugins/jpeg/JPEGImageWriteParam.h b/libjava/javax/imageio/plugins/jpeg/JPEGImageWriteParam.h
deleted file mode 100644
index 03607d122a9..00000000000
--- a/libjava/javax/imageio/plugins/jpeg/JPEGImageWriteParam.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_jpeg_JPEGImageWriteParam__
-#define __javax_imageio_plugins_jpeg_JPEGImageWriteParam__
-
-#pragma interface
-
-#include <javax/imageio/ImageWriteParam.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-            class JPEGImageWriteParam;
-            class JPEGQTable;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::jpeg::JPEGImageWriteParam : public ::javax::imageio::ImageWriteParam
-{
-
-public:
-  JPEGImageWriteParam(::java::util::Locale *);
-  virtual void unsetCompression();
-  virtual jboolean isCompressionLossless();
-  virtual JArray< ::java::lang::String * > * getCompressionQualityDescriptions();
-  virtual JArray< jfloat > * getCompressionQualityValues();
-  virtual jboolean areTablesSet();
-  virtual void setEncodeTables(JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > *, JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > *, JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > *);
-  virtual void unsetEncodeTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * getQTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * getDCHuffmanTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * getACHuffmanTables();
-  virtual void setOptimizeHuffmanTables(jboolean);
-  virtual jboolean getOptimizeHuffmanTables();
-private:
-  JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * __attribute__((aligned(__alignof__( ::javax::imageio::ImageWriteParam)))) qTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * DCHuffmanTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * ACHuffmanTables;
-  jboolean optimize;
-  JArray< ::java::lang::String * > * compressionQualityDescriptions;
-  JArray< jfloat > * compressionQualityValues;
-  ::java::util::ResourceBundle * messages;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_jpeg_JPEGImageWriteParam__
diff --git a/libjava/javax/imageio/plugins/jpeg/JPEGQTable.h b/libjava/javax/imageio/plugins/jpeg/JPEGQTable.h
deleted file mode 100644
index 366202f5664..00000000000
--- a/libjava/javax/imageio/plugins/jpeg/JPEGQTable.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_jpeg_JPEGQTable__
-#define __javax_imageio_plugins_jpeg_JPEGQTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGQTable;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::jpeg::JPEGQTable : public ::java::lang::Object
-{
-
-public:
-  JPEGQTable(JArray< jint > *);
-private:
-  JPEGQTable(JArray< jint > *, jboolean);
-  static JArray< jint > * checkTable(JArray< jint > *);
-public:
-  virtual JArray< jint > * getTable();
-  virtual ::javax::imageio::plugins::jpeg::JPEGQTable * getScaledInstance(jfloat, jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) table;
-public:
-  static ::javax::imageio::plugins::jpeg::JPEGQTable * K1Luminance;
-  static ::javax::imageio::plugins::jpeg::JPEGQTable * K1Div2Luminance;
-  static ::javax::imageio::plugins::jpeg::JPEGQTable * K2Chrominance;
-  static ::javax::imageio::plugins::jpeg::JPEGQTable * K2Div2Chrominance;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_jpeg_JPEGQTable__
diff --git a/libjava/javax/imageio/spi/IIORegistry.h b/libjava/javax/imageio/spi/IIORegistry.h
deleted file mode 100644
index 4b15c121ff1..00000000000
--- a/libjava/javax/imageio/spi/IIORegistry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_IIORegistry__
-#define __javax_imageio_spi_IIORegistry__
-
-#pragma interface
-
-#include <javax/imageio/spi/ServiceRegistry.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::IIORegistry : public ::javax::imageio::spi::ServiceRegistry
-{
-
-public:
-  static ::javax::imageio::spi::IIORegistry * getDefaultInstance();
-private:
-  IIORegistry();
-public:
-  void registerApplicationClasspathSpis();
-private:
-  static ::java::util::HashSet * defaultCategories;
-  static ::java::util::HashMap * instances;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_IIORegistry__
diff --git a/libjava/javax/imageio/spi/IIOServiceProvider.h b/libjava/javax/imageio/spi/IIOServiceProvider.h
deleted file mode 100644
index befcd09ccfc..00000000000
--- a/libjava/javax/imageio/spi/IIOServiceProvider.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_IIOServiceProvider__
-#define __javax_imageio_spi_IIOServiceProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIOServiceProvider;
-          class ServiceRegistry;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::IIOServiceProvider : public ::java::lang::Object
-{
-
-public:
-  IIOServiceProvider(::java::lang::String *, ::java::lang::String *);
-  IIOServiceProvider();
-  virtual void onRegistration(::javax::imageio::spi::ServiceRegistry *, ::java::lang::Class *);
-  virtual void onDeregistration(::javax::imageio::spi::ServiceRegistry *, ::java::lang::Class *);
-  virtual ::java::lang::String * getVendorName();
-  virtual ::java::lang::String * getVersion();
-  virtual ::java::lang::String * getDescription(::java::util::Locale *) = 0;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) vendorName;
-  ::java::lang::String * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_IIOServiceProvider__
diff --git a/libjava/javax/imageio/spi/ImageInputStreamSpi.h b/libjava/javax/imageio/spi/ImageInputStreamSpi.h
deleted file mode 100644
index 946842c61f3..00000000000
--- a/libjava/javax/imageio/spi/ImageInputStreamSpi.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageInputStreamSpi__
-#define __javax_imageio_spi_ImageInputStreamSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/IIOServiceProvider.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ImageInputStreamSpi;
-      }
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageInputStreamSpi : public ::javax::imageio::spi::IIOServiceProvider
-{
-
-public: // actually protected
-  ImageInputStreamSpi();
-public:
-  ImageInputStreamSpi(::java::lang::String *, ::java::lang::String *, ::java::lang::Class *);
-  virtual ::java::lang::Class * getInputClass();
-  virtual jboolean canUseCacheFile();
-  virtual jboolean needsCacheFile();
-  virtual ::javax::imageio::stream::ImageInputStream * createInputStreamInstance(::java::lang::Object *, jboolean, ::java::io::File *) = 0;
-  virtual ::javax::imageio::stream::ImageInputStream * createInputStreamInstance(::java::lang::Object *);
-public: // actually protected
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::javax::imageio::spi::IIOServiceProvider)))) inputClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageInputStreamSpi__
diff --git a/libjava/javax/imageio/spi/ImageOutputStreamSpi.h b/libjava/javax/imageio/spi/ImageOutputStreamSpi.h
deleted file mode 100644
index 6ac36b4aa97..00000000000
--- a/libjava/javax/imageio/spi/ImageOutputStreamSpi.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageOutputStreamSpi__
-#define __javax_imageio_spi_ImageOutputStreamSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/IIOServiceProvider.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ImageOutputStreamSpi;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageOutputStreamSpi : public ::javax::imageio::spi::IIOServiceProvider
-{
-
-public: // actually protected
-  ImageOutputStreamSpi();
-public:
-  ImageOutputStreamSpi(::java::lang::String *, ::java::lang::String *, ::java::lang::Class *);
-  virtual ::java::lang::Class * getOutputClass();
-  virtual jboolean canUseCacheFile();
-  virtual jboolean needsCacheFile();
-  virtual ::javax::imageio::stream::ImageOutputStream * createOutputStreamInstance(::java::lang::Object *, jboolean, ::java::io::File *) = 0;
-  virtual ::javax::imageio::stream::ImageOutputStream * createOutputStreamInstance(::java::lang::Object *);
-public: // actually protected
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::javax::imageio::spi::IIOServiceProvider)))) outputClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageOutputStreamSpi__
diff --git a/libjava/javax/imageio/spi/ImageReaderSpi.h b/libjava/javax/imageio/spi/ImageReaderSpi.h
deleted file mode 100644
index 554b52ee785..00000000000
--- a/libjava/javax/imageio/spi/ImageReaderSpi.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageReaderSpi__
-#define __javax_imageio_spi_ImageReaderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderWriterSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace spi
-      {
-          class ImageReaderSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageReaderSpi : public ::javax::imageio::spi::ImageReaderWriterSpi
-{
-
-public: // actually protected
-  ImageReaderSpi();
-public:
-  ImageReaderSpi(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-  virtual jboolean canDecodeInput(::java::lang::Object *) = 0;
-  virtual ::javax::imageio::ImageReader * createReaderInstance();
-  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *) = 0;
-  virtual JArray< ::java::lang::String * > * getImageWriterSpiNames();
-  virtual JArray< ::java::lang::Class * > * getInputTypes();
-  virtual jboolean isOwnReader(::javax::imageio::ImageReader *);
-  static JArray< ::java::lang::Class * > * STANDARD_INPUT_TYPE;
-public: // actually protected
-  JArray< ::java::lang::Class * > * __attribute__((aligned(__alignof__( ::javax::imageio::spi::ImageReaderWriterSpi)))) inputTypes;
-  JArray< ::java::lang::String * > * writerSpiNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageReaderSpi__
diff --git a/libjava/javax/imageio/spi/ImageReaderWriterSpi.h b/libjava/javax/imageio/spi/ImageReaderWriterSpi.h
deleted file mode 100644
index 91930cd208f..00000000000
--- a/libjava/javax/imageio/spi/ImageReaderWriterSpi.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageReaderWriterSpi__
-#define __javax_imageio_spi_ImageReaderWriterSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/IIOServiceProvider.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormat;
-      }
-      namespace spi
-      {
-          class ImageReaderWriterSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageReaderWriterSpi : public ::javax::imageio::spi::IIOServiceProvider
-{
-
-public:
-  ImageReaderWriterSpi();
-  ImageReaderWriterSpi(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::lang::String *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-  virtual JArray< ::java::lang::String * > * getFormatNames();
-  virtual JArray< ::java::lang::String * > * getFileSuffixes();
-  virtual JArray< ::java::lang::String * > * getMIMETypes();
-  virtual ::java::lang::String * getPluginClassName();
-  virtual jboolean isStandardStreamMetadataFormatSupported();
-  virtual ::java::lang::String * getNativeStreamMetadataFormatName();
-  virtual JArray< ::java::lang::String * > * getExtraStreamMetadataFormatNames();
-  virtual jboolean isStandardImageMetadataFormatSupported();
-  virtual ::java::lang::String * getNativeImageMetadataFormatName();
-  virtual JArray< ::java::lang::String * > * getExtraImageMetadataFormatNames();
-  virtual ::javax::imageio::metadata::IIOMetadataFormat * getStreamMetadataFormat(::java::lang::String *);
-  virtual ::javax::imageio::metadata::IIOMetadataFormat * getImageMetadataFormat(::java::lang::String *);
-public: // actually protected
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::javax::imageio::spi::IIOServiceProvider)))) names;
-  JArray< ::java::lang::String * > * suffixes;
-  JArray< ::java::lang::String * > * MIMETypes;
-  ::java::lang::String * pluginClassName;
-  jboolean supportsStandardStreamMetadataFormat;
-  ::java::lang::String * nativeStreamMetadataFormatName;
-  ::java::lang::String * nativeStreamMetadataFormatClassName;
-  JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
-  JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
-  jboolean supportsStandardImageMetadataFormat;
-  ::java::lang::String * nativeImageMetadataFormatName;
-  ::java::lang::String * nativeImageMetadataFormatClassName;
-  JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
-  JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageReaderWriterSpi__
diff --git a/libjava/javax/imageio/spi/ImageTranscoderSpi.h b/libjava/javax/imageio/spi/ImageTranscoderSpi.h
deleted file mode 100644
index 368c2ad631a..00000000000
--- a/libjava/javax/imageio/spi/ImageTranscoderSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageTranscoderSpi__
-#define __javax_imageio_spi_ImageTranscoderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/IIOServiceProvider.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTranscoder;
-      namespace spi
-      {
-          class ImageTranscoderSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageTranscoderSpi : public ::javax::imageio::spi::IIOServiceProvider
-{
-
-public: // actually protected
-  ImageTranscoderSpi();
-public:
-  ImageTranscoderSpi(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getReaderServiceProviderName() = 0;
-  virtual ::java::lang::String * getWriterServiceProviderName() = 0;
-  virtual ::javax::imageio::ImageTranscoder * createTranscoderInstance() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageTranscoderSpi__
diff --git a/libjava/javax/imageio/spi/ImageWriterSpi.h b/libjava/javax/imageio/spi/ImageWriterSpi.h
deleted file mode 100644
index 55d9bdb8ed8..00000000000
--- a/libjava/javax/imageio/spi/ImageWriterSpi.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageWriterSpi__
-#define __javax_imageio_spi_ImageWriterSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderWriterSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class RenderedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-        class ImageWriter;
-      namespace spi
-      {
-          class ImageWriterSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageWriterSpi : public ::javax::imageio::spi::ImageReaderWriterSpi
-{
-
-public: // actually protected
-  ImageWriterSpi();
-public:
-  ImageWriterSpi(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-  virtual jboolean canEncodeImage(::javax::imageio::ImageTypeSpecifier *) = 0;
-  virtual jboolean canEncodeImage(::java::awt::image::RenderedImage *);
-  virtual ::javax::imageio::ImageWriter * createWriterInstance();
-  virtual ::javax::imageio::ImageWriter * createWriterInstance(::java::lang::Object *) = 0;
-  virtual JArray< ::java::lang::String * > * getImageReaderSpiNames();
-  virtual JArray< ::java::lang::Class * > * getOutputTypes();
-  virtual jboolean isFormatLossless();
-  virtual jboolean isOwnWriter(::javax::imageio::ImageWriter *);
-  static JArray< ::java::lang::Class * > * STANDARD_OUTPUT_TYPE;
-public: // actually protected
-  JArray< ::java::lang::Class * > * __attribute__((aligned(__alignof__( ::javax::imageio::spi::ImageReaderWriterSpi)))) outputTypes;
-  JArray< ::java::lang::String * > * readerSpiNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageWriterSpi__
diff --git a/libjava/javax/imageio/spi/RegisterableService.h b/libjava/javax/imageio/spi/RegisterableService.h
deleted file mode 100644
index fcd4e140f69..00000000000
--- a/libjava/javax/imageio/spi/RegisterableService.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_RegisterableService__
-#define __javax_imageio_spi_RegisterableService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class RegisterableService;
-          class ServiceRegistry;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::RegisterableService : public ::java::lang::Object
-{
-
-public:
-  virtual void onRegistration(::javax::imageio::spi::ServiceRegistry *, ::java::lang::Class *) = 0;
-  virtual void onDeregistration(::javax::imageio::spi::ServiceRegistry *, ::java::lang::Class *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_spi_RegisterableService__
diff --git a/libjava/javax/imageio/spi/ServiceRegistry$1.h b/libjava/javax/imageio/spi/ServiceRegistry$1.h
deleted file mode 100644
index 431ba3115e2..00000000000
--- a/libjava/javax/imageio/spi/ServiceRegistry$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ServiceRegistry$1__
-#define __javax_imageio_spi_ServiceRegistry$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ServiceRegistry;
-          class ServiceRegistry$1;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ServiceRegistry$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ServiceRegistry$1(::javax::imageio::spi::ServiceRegistry *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  ::javax::imageio::spi::ServiceRegistry * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ServiceRegistry$1__
diff --git a/libjava/javax/imageio/spi/ServiceRegistry$2.h b/libjava/javax/imageio/spi/ServiceRegistry$2.h
deleted file mode 100644
index 0934d4ac2ad..00000000000
--- a/libjava/javax/imageio/spi/ServiceRegistry$2.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ServiceRegistry$2__
-#define __javax_imageio_spi_ServiceRegistry$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ServiceRegistry;
-          class ServiceRegistry$2;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ServiceRegistry$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ServiceRegistry$2(::javax::imageio::spi::ServiceRegistry *, ::java::util::Map *);
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::javax::imageio::spi::ServiceRegistry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::util::Map * val$cons;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ServiceRegistry$2__
diff --git a/libjava/javax/imageio/spi/ServiceRegistry$Filter.h b/libjava/javax/imageio/spi/ServiceRegistry$Filter.h
deleted file mode 100644
index 10fd5aaff7f..00000000000
--- a/libjava/javax/imageio/spi/ServiceRegistry$Filter.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ServiceRegistry$Filter__
-#define __javax_imageio_spi_ServiceRegistry$Filter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ServiceRegistry$Filter;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ServiceRegistry$Filter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean filter(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_spi_ServiceRegistry$Filter__
diff --git a/libjava/javax/imageio/spi/ServiceRegistry.h b/libjava/javax/imageio/spi/ServiceRegistry.h
deleted file mode 100644
index 79a48fe3fd5..00000000000
--- a/libjava/javax/imageio/spi/ServiceRegistry.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ServiceRegistry__
-#define __javax_imageio_spi_ServiceRegistry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ServiceRegistry;
-          class ServiceRegistry$Filter;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ServiceRegistry : public ::java::lang::Object
-{
-
-public:
-  ServiceRegistry(::java::util::Iterator *);
-  static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *);
-  static ::java::util::Iterator * lookupProviders(::java::lang::Class *);
-  virtual ::java::util::Iterator * getCategories();
-private:
-  jboolean registerServiceProvider(::java::lang::Object *, jint);
-public:
-  virtual jboolean registerServiceProvider(::java::lang::Object *, ::java::lang::Class *);
-  virtual void registerServiceProvider(::java::lang::Object *);
-  virtual void registerServiceProviders(::java::util::Iterator *);
-private:
-  jboolean deregisterServiceProvider(::java::lang::Object *, jint);
-public:
-  virtual jboolean deregisterServiceProvider(::java::lang::Object *, ::java::lang::Class *);
-  virtual void deregisterServiceProvider(::java::lang::Object *);
-  virtual void deregisterAll(::java::lang::Class *);
-  virtual void deregisterAll();
-  virtual void finalize();
-  virtual jboolean contains(::java::lang::Object *);
-private:
-  jint getCategoryID(::java::lang::Class *);
-public:
-  virtual ::java::util::Iterator * getServiceProviders(::java::lang::Class *, jboolean);
-  virtual ::java::util::Iterator * getServiceProviders(::java::lang::Class *, ::javax::imageio::spi::ServiceRegistry$Filter *, jboolean);
-  virtual ::java::lang::Object * getServiceProviderByClass(::java::lang::Class *);
-  virtual jboolean setOrdering(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean unsetOrdering(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  jboolean addConstraint(jint, ::java::lang::Object *, ::java::lang::Object *);
-  jboolean removeConstraint(jint, ::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  JArray< ::java::lang::Class * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) categories;
-private:
-  JArray< ::java::util::LinkedList * > * providers;
-  JArray< ::java::util::IdentityHashMap * > * constraints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ServiceRegistry__
diff --git a/libjava/javax/imageio/stream/FileCacheImageInputStream.h b/libjava/javax/imageio/stream/FileCacheImageInputStream.h
deleted file mode 100644
index 728ed37bdf6..00000000000
--- a/libjava/javax/imageio/stream/FileCacheImageInputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_FileCacheImageInputStream__
-#define __javax_imageio_stream_FileCacheImageInputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class FileCacheImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::FileCacheImageInputStream : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  FileCacheImageInputStream(::java::io::InputStream *, ::java::io::File *);
-  virtual void close();
-private:
-  void checkStreamClosed();
-public:
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageInputStreamImpl)))) stream;
-  ::java::io::File * cacheDir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_FileCacheImageInputStream__
diff --git a/libjava/javax/imageio/stream/FileCacheImageOutputStream.h b/libjava/javax/imageio/stream/FileCacheImageOutputStream.h
deleted file mode 100644
index c473085e903..00000000000
--- a/libjava/javax/imageio/stream/FileCacheImageOutputStream.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_FileCacheImageOutputStream__
-#define __javax_imageio_stream_FileCacheImageOutputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageOutputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class FileCacheImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::FileCacheImageOutputStream : public ::javax::imageio::stream::ImageOutputStreamImpl
-{
-
-public:
-  FileCacheImageOutputStream(::java::io::OutputStream *, ::java::io::File *);
-  virtual void close();
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(jint);
-  virtual jlong length();
-  virtual void seek(jlong);
-  virtual void flushBefore(jlong);
-private:
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageOutputStreamImpl)))) stream;
-  ::java::io::File * cacheFile;
-  ::java::io::RandomAccessFile * cache;
-  jlong maxPos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_FileCacheImageOutputStream__
diff --git a/libjava/javax/imageio/stream/FileImageInputStream.h b/libjava/javax/imageio/stream/FileImageInputStream.h
deleted file mode 100644
index 801e2cb1d48..00000000000
--- a/libjava/javax/imageio/stream/FileImageInputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_FileImageInputStream__
-#define __javax_imageio_stream_FileImageInputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class FileImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::FileImageInputStream : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  FileImageInputStream(::java::io::File *);
-  FileImageInputStream(::java::io::RandomAccessFile *);
-  virtual void close();
-  virtual jlong length();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void seek(jlong);
-private:
-  ::java::io::RandomAccessFile * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageInputStreamImpl)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_FileImageInputStream__
diff --git a/libjava/javax/imageio/stream/FileImageOutputStream.h b/libjava/javax/imageio/stream/FileImageOutputStream.h
deleted file mode 100644
index 8075f45772b..00000000000
--- a/libjava/javax/imageio/stream/FileImageOutputStream.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_FileImageOutputStream__
-#define __javax_imageio_stream_FileImageOutputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageOutputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class FileImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::FileImageOutputStream : public ::javax::imageio::stream::ImageOutputStreamImpl
-{
-
-public:
-  FileImageOutputStream(::java::io::File *);
-  FileImageOutputStream(::java::io::RandomAccessFile *);
-  virtual void close();
-  virtual jlong length();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void seek(jlong);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(jint);
-private:
-  ::java::io::RandomAccessFile * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageOutputStreamImpl)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_FileImageOutputStream__
diff --git a/libjava/javax/imageio/stream/IIOByteBuffer.h b/libjava/javax/imageio/stream/IIOByteBuffer.h
deleted file mode 100644
index 0e5e0c145ef..00000000000
--- a/libjava/javax/imageio/stream/IIOByteBuffer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_IIOByteBuffer__
-#define __javax_imageio_stream_IIOByteBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class IIOByteBuffer;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::IIOByteBuffer : public ::java::lang::Object
-{
-
-public:
-  IIOByteBuffer(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * getData();
-  virtual void setData(JArray< jbyte > *);
-  virtual jint getOffset();
-  virtual void setOffset(jint);
-  virtual jint getLength();
-  virtual void setLength(jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-  jint offset;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_IIOByteBuffer__
diff --git a/libjava/javax/imageio/stream/ImageInputStream.h b/libjava/javax/imageio/stream/ImageInputStream.h
deleted file mode 100644
index 99c6304c455..00000000000
--- a/libjava/javax/imageio/stream/ImageInputStream.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_ImageInputStream__
-#define __javax_imageio_stream_ImageInputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class IIOByteBuffer;
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::ImageInputStream : public ::java::lang::Object
-{
-
-public:
-  virtual void setByteOrder(::java::nio::ByteOrder *) = 0;
-  virtual ::java::nio::ByteOrder * getByteOrder() = 0;
-  virtual jint read() = 0;
-  virtual jint read(JArray< jbyte > *) = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual void readBytes(::javax::imageio::stream::IIOByteBuffer *, jint) = 0;
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jint readUnsignedByte() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readUnsignedShort() = 0;
-  virtual jchar readChar() = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readUnsignedInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual ::java::lang::String * readLine() = 0;
-  virtual ::java::lang::String * readUTF() = 0;
-  virtual void readFully(JArray< jbyte > *, jint, jint) = 0;
-  virtual void readFully(JArray< jbyte > *) = 0;
-  virtual void readFully(JArray< jshort > *, jint, jint) = 0;
-  virtual void readFully(JArray< jchar > *, jint, jint) = 0;
-  virtual void readFully(JArray< jint > *, jint, jint) = 0;
-  virtual void readFully(JArray< jlong > *, jint, jint) = 0;
-  virtual void readFully(JArray< jfloat > *, jint, jint) = 0;
-  virtual void readFully(JArray< jdouble > *, jint, jint) = 0;
-  virtual jlong getStreamPosition() = 0;
-  virtual jint getBitOffset() = 0;
-  virtual void setBitOffset(jint) = 0;
-  virtual jint readBit() = 0;
-  virtual jlong readBits(jint) = 0;
-  virtual jlong length() = 0;
-  virtual jint skipBytes(jint) = 0;
-  virtual jlong skipBytes(jlong) = 0;
-  virtual void seek(jlong) = 0;
-  virtual void mark() = 0;
-  virtual void reset() = 0;
-  virtual void flushBefore(jlong) = 0;
-  virtual void flush() = 0;
-  virtual jlong getFlushedPosition() = 0;
-  virtual jboolean isCached() = 0;
-  virtual jboolean isCachedMemory() = 0;
-  virtual jboolean isCachedFile() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_stream_ImageInputStream__
diff --git a/libjava/javax/imageio/stream/ImageInputStreamImpl.h b/libjava/javax/imageio/stream/ImageInputStreamImpl.h
deleted file mode 100644
index 42b2f12042a..00000000000
--- a/libjava/javax/imageio/stream/ImageInputStreamImpl.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_ImageInputStreamImpl__
-#define __javax_imageio_stream_ImageInputStreamImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class IIOByteBuffer;
-          class ImageInputStreamImpl;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::ImageInputStreamImpl : public ::java::lang::Object
-{
-
-public:
-  ImageInputStreamImpl();
-public: // actually protected
-  virtual void checkClosed();
-public:
-  virtual void close();
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual void flush();
-  virtual void flushBefore(jlong);
-  virtual jint getBitOffset();
-  virtual ::java::nio::ByteOrder * getByteOrder();
-  virtual jlong getFlushedPosition();
-  virtual jlong getStreamPosition();
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jlong length();
-  virtual void mark();
-  virtual jint read() = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint read(JArray< jbyte > *);
-  virtual jint readBit();
-  virtual jlong readBits(jint);
-  virtual jboolean readBoolean();
-  virtual jbyte readByte();
-  virtual void readBytes(::javax::imageio::stream::IIOByteBuffer *, jint);
-  virtual jchar readChar();
-  virtual jdouble readDouble();
-  virtual jfloat readFloat();
-  virtual void readFully(JArray< jbyte > *);
-  virtual void readFully(JArray< jbyte > *, jint, jint);
-  virtual void readFully(JArray< jchar > *, jint, jint);
-  virtual void readFully(JArray< jdouble > *, jint, jint);
-  virtual void readFully(JArray< jfloat > *, jint, jint);
-  virtual void readFully(JArray< jint > *, jint, jint);
-  virtual void readFully(JArray< jlong > *, jint, jint);
-  virtual void readFully(JArray< jshort > *, jint, jint);
-  virtual jint readInt();
-  virtual ::java::lang::String * readLine();
-  virtual jlong readLong();
-  virtual jshort readShort();
-  virtual jint readUnsignedByte();
-  virtual jlong readUnsignedInt();
-  virtual jint readUnsignedShort();
-  virtual ::java::lang::String * readUTF();
-  virtual void reset();
-  virtual void seek(jlong);
-  virtual void setBitOffset(jint);
-  virtual void setByteOrder(::java::nio::ByteOrder *);
-  virtual jint skipBytes(jint);
-  virtual jlong skipBytes(jlong);
-private:
-  void readFullyPrivate(JArray< jbyte > *, jint, jint);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) closed;
-  ::java::util::Stack * markStack;
-public: // actually package-private
-  JArray< jbyte > * buffer;
-public: // actually protected
-  jint bitOffset;
-  ::java::nio::ByteOrder * byteOrder;
-  jlong flushedPos;
-  jlong streamPos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_ImageInputStreamImpl__
diff --git a/libjava/javax/imageio/stream/ImageOutputStream.h b/libjava/javax/imageio/stream/ImageOutputStream.h
deleted file mode 100644
index 7557e0a670b..00000000000
--- a/libjava/javax/imageio/stream/ImageOutputStream.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_ImageOutputStream__
-#define __javax_imageio_stream_ImageOutputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class IIOByteBuffer;
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::ImageOutputStream : public ::java::lang::Object
-{
-
-public:
-  virtual void flushBefore(jlong) = 0;
-  virtual void write(JArray< jbyte > *) = 0;
-  virtual void write(JArray< jbyte > *, jint, jint) = 0;
-  virtual void write(jint) = 0;
-  virtual void writeBit(jint) = 0;
-  virtual void writeBits(jlong, jint) = 0;
-  virtual void writeBoolean(jboolean) = 0;
-  virtual void writeByte(jint) = 0;
-  virtual void writeBytes(::java::lang::String *) = 0;
-  virtual void writeChar(jint) = 0;
-  virtual void writeChars(JArray< jchar > *, jint, jint) = 0;
-  virtual void writeChars(::java::lang::String *) = 0;
-  virtual void writeDouble(jdouble) = 0;
-  virtual void writeDoubles(JArray< jdouble > *, jint, jint) = 0;
-  virtual void writeFloat(jfloat) = 0;
-  virtual void writeFloats(JArray< jfloat > *, jint, jint) = 0;
-  virtual void writeInt(jint) = 0;
-  virtual void writeInts(JArray< jint > *, jint, jint) = 0;
-  virtual void writeLong(jlong) = 0;
-  virtual void writeLongs(JArray< jlong > *, jint, jint) = 0;
-  virtual void writeShort(jint) = 0;
-  virtual void writeShorts(JArray< jshort > *, jint, jint) = 0;
-  virtual void writeUTF(::java::lang::String *) = 0;
-  virtual void setByteOrder(::java::nio::ByteOrder *) = 0;
-  virtual ::java::nio::ByteOrder * getByteOrder() = 0;
-  virtual jint read() = 0;
-  virtual jint read(JArray< jbyte > *) = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual void readBytes(::javax::imageio::stream::IIOByteBuffer *, jint) = 0;
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jint readUnsignedByte() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readUnsignedShort() = 0;
-  virtual jchar readChar() = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readUnsignedInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual ::java::lang::String * readLine() = 0;
-  virtual ::java::lang::String * readUTF() = 0;
-  virtual void readFully(JArray< jbyte > *, jint, jint) = 0;
-  virtual void readFully(JArray< jbyte > *) = 0;
-  virtual void readFully(JArray< jshort > *, jint, jint) = 0;
-  virtual void readFully(JArray< jchar > *, jint, jint) = 0;
-  virtual void readFully(JArray< jint > *, jint, jint) = 0;
-  virtual void readFully(JArray< jlong > *, jint, jint) = 0;
-  virtual void readFully(JArray< jfloat > *, jint, jint) = 0;
-  virtual void readFully(JArray< jdouble > *, jint, jint) = 0;
-  virtual jlong getStreamPosition() = 0;
-  virtual jint getBitOffset() = 0;
-  virtual void setBitOffset(jint) = 0;
-  virtual jint readBit() = 0;
-  virtual jlong readBits(jint) = 0;
-  virtual jlong length() = 0;
-  virtual jint skipBytes(jint) = 0;
-  virtual jlong skipBytes(jlong) = 0;
-  virtual void seek(jlong) = 0;
-  virtual void mark() = 0;
-  virtual void reset() = 0;
-  virtual void flush() = 0;
-  virtual jlong getFlushedPosition() = 0;
-  virtual jboolean isCached() = 0;
-  virtual jboolean isCachedMemory() = 0;
-  virtual jboolean isCachedFile() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_stream_ImageOutputStream__
diff --git a/libjava/javax/imageio/stream/ImageOutputStreamImpl.h b/libjava/javax/imageio/stream/ImageOutputStreamImpl.h
deleted file mode 100644
index a45df4698a3..00000000000
--- a/libjava/javax/imageio/stream/ImageOutputStreamImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_ImageOutputStreamImpl__
-#define __javax_imageio_stream_ImageOutputStreamImpl__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageOutputStreamImpl;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::ImageOutputStreamImpl : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  ImageOutputStreamImpl();
-public: // actually protected
-  virtual void flushBits();
-public:
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint) = 0;
-  virtual void write(jint) = 0;
-  virtual void writeBit(jint);
-  virtual void writeBits(jlong, jint);
-  virtual void writeBoolean(jboolean);
-  virtual void writeByte(jint);
-  virtual void writeBytes(::java::lang::String *);
-  virtual void writeChar(jint);
-  virtual void writeChars(JArray< jchar > *, jint, jint);
-  virtual void writeChars(::java::lang::String *);
-  virtual void writeDouble(jdouble);
-  virtual void writeDoubles(JArray< jdouble > *, jint, jint);
-  virtual void writeFloat(jfloat);
-  virtual void writeFloats(JArray< jfloat > *, jint, jint);
-  virtual void writeInt(jint);
-  virtual void writeInts(JArray< jint > *, jint, jint);
-  virtual void writeLong(jlong);
-  virtual void writeLongs(JArray< jlong > *, jint, jint);
-  virtual void writeShort(jint);
-  virtual void writeShorts(JArray< jshort > *, jint, jint);
-  virtual void writeUTF(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_ImageOutputStreamImpl__
diff --git a/libjava/javax/imageio/stream/MemoryCacheImageInputStream.h b/libjava/javax/imageio/stream/MemoryCacheImageInputStream.h
deleted file mode 100644
index c83efe11204..00000000000
--- a/libjava/javax/imageio/stream/MemoryCacheImageInputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_MemoryCacheImageInputStream__
-#define __javax_imageio_stream_MemoryCacheImageInputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class MemoryCacheImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::MemoryCacheImageInputStream : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  MemoryCacheImageInputStream(::java::io::InputStream *);
-  virtual void close();
-  virtual void flushBefore(jlong);
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void seek(jlong);
-private:
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageInputStreamImpl)))) stream;
-  ::java::io::BufferedInputStream * buffer;
-  jint READLIMIT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_MemoryCacheImageInputStream__
diff --git a/libjava/javax/imageio/stream/MemoryCacheImageOutputStream.h b/libjava/javax/imageio/stream/MemoryCacheImageOutputStream.h
deleted file mode 100644
index a7643c1ea11..00000000000
--- a/libjava/javax/imageio/stream/MemoryCacheImageOutputStream.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_MemoryCacheImageOutputStream__
-#define __javax_imageio_stream_MemoryCacheImageOutputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageOutputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class MemoryCacheImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::MemoryCacheImageOutputStream : public ::javax::imageio::stream::ImageOutputStreamImpl
-{
-
-public:
-  MemoryCacheImageOutputStream(::java::io::OutputStream *);
-  virtual void close();
-  virtual void flushBefore(jlong);
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(jint);
-private:
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageOutputStreamImpl)))) stream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_MemoryCacheImageOutputStream__
diff --git a/libjava/javax/management/Attribute.h b/libjava/javax/management/Attribute.h
deleted file mode 100644
index 304b9da4a86..00000000000
--- a/libjava/javax/management/Attribute.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Attribute__
-#define __javax_management_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-    }
-  }
-}
-
-class javax::management::Attribute : public ::java::lang::Object
-{
-
-public:
-  Attribute(::java::lang::String *, ::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::Object * getValue();
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = 2484220110589082382LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) m_name;
-  ::java::lang::Object * m_value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Attribute__
diff --git a/libjava/javax/management/AttributeChangeNotification.h b/libjava/javax/management/AttributeChangeNotification.h
deleted file mode 100644
index ca37cd389f4..00000000000
--- a/libjava/javax/management/AttributeChangeNotification.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_AttributeChangeNotification__
-#define __javax_management_AttributeChangeNotification__
-
-#pragma interface
-
-#include <javax/management/Notification.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class AttributeChangeNotification;
-    }
-  }
-}
-
-class javax::management::AttributeChangeNotification : public ::javax::management::Notification
-{
-
-public:
-  AttributeChangeNotification(::java::lang::Object *, jlong, jlong, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::String * getAttributeName();
-  virtual ::java::lang::String * getAttributeType();
-  virtual ::java::lang::Object * getOldValue();
-  virtual ::java::lang::Object * getNewValue();
-private:
-  static const jlong serialVersionUID = 535176054565814134LL;
-public:
-  static ::java::lang::String * ATTRIBUTE_CHANGE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::Notification)))) attributeName;
-  ::java::lang::String * attributeType;
-  ::java::lang::Object * oldValue;
-  ::java::lang::Object * newValue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_AttributeChangeNotification__
diff --git a/libjava/javax/management/AttributeChangeNotificationFilter.h b/libjava/javax/management/AttributeChangeNotificationFilter.h
deleted file mode 100644
index 31c14e24e00..00000000000
--- a/libjava/javax/management/AttributeChangeNotificationFilter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_AttributeChangeNotificationFilter__
-#define __javax_management_AttributeChangeNotificationFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class AttributeChangeNotificationFilter;
-        class Notification;
-    }
-  }
-}
-
-class javax::management::AttributeChangeNotificationFilter : public ::java::lang::Object
-{
-
-public:
-  AttributeChangeNotificationFilter();
-  virtual void disableAllAttributes();
-  virtual void disableAttribute(::java::lang::String *);
-  virtual void enableAttribute(::java::lang::String *);
-  virtual ::java::util::Vector * getEnabledAttributes();
-  virtual jboolean isNotificationEnabled(::javax::management::Notification *);
-private:
-  static const jlong serialVersionUID = -6347317584796410029LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabledAttributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_AttributeChangeNotificationFilter__
diff --git a/libjava/javax/management/AttributeList.h b/libjava/javax/management/AttributeList.h
deleted file mode 100644
index a74ff2fb125..00000000000
--- a/libjava/javax/management/AttributeList.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_AttributeList__
-#define __javax_management_AttributeList__
-
-#pragma interface
-
-#include <java/util/ArrayList.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-    }
-  }
-}
-
-class javax::management::AttributeList : public ::java::util::ArrayList
-{
-
-public:
-  AttributeList();
-  AttributeList(::javax::management::AttributeList *);
-  AttributeList(jint);
-  virtual void add(::javax::management::Attribute *);
-  virtual void add(jint, ::javax::management::Attribute *);
-  virtual jboolean addAll(::javax::management::AttributeList *);
-  virtual jboolean addAll(jint, ::javax::management::AttributeList *);
-  virtual void set(jint, ::javax::management::Attribute *);
-private:
-  static const jlong serialVersionUID = -4077085769279709076LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_AttributeList__
diff --git a/libjava/javax/management/AttributeNotFoundException.h b/libjava/javax/management/AttributeNotFoundException.h
deleted file mode 100644
index 4defc660b61..00000000000
--- a/libjava/javax/management/AttributeNotFoundException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_AttributeNotFoundException__
-#define __javax_management_AttributeNotFoundException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class AttributeNotFoundException;
-    }
-  }
-}
-
-class javax::management::AttributeNotFoundException : public ::javax::management::OperationsException
-{
-
-public:
-  AttributeNotFoundException();
-  AttributeNotFoundException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_AttributeNotFoundException__
diff --git a/libjava/javax/management/AttributeValueExp.h b/libjava/javax/management/AttributeValueExp.h
deleted file mode 100644
index 02ad058adc1..00000000000
--- a/libjava/javax/management/AttributeValueExp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_AttributeValueExp__
-#define __javax_management_AttributeValueExp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class AttributeValueExp;
-        class MBeanServer;
-        class ObjectName;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::AttributeValueExp : public ::java::lang::Object
-{
-
-public:
-  AttributeValueExp();
-  AttributeValueExp(::java::lang::String *);
-  virtual ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
-public: // actually protected
-  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *);
-public:
-  virtual ::java::lang::String * getAttributeName();
-  virtual void setMBeanServer(::javax::management::MBeanServer *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -7768025046539163385LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_AttributeValueExp__
diff --git a/libjava/javax/management/BadAttributeValueExpException.h b/libjava/javax/management/BadAttributeValueExpException.h
deleted file mode 100644
index 5a05f6a6bb4..00000000000
--- a/libjava/javax/management/BadAttributeValueExpException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_BadAttributeValueExpException__
-#define __javax_management_BadAttributeValueExpException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class BadAttributeValueExpException;
-    }
-  }
-}
-
-class javax::management::BadAttributeValueExpException : public ::java::lang::Exception
-{
-
-public:
-  BadAttributeValueExpException(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3105272988410493376LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_BadAttributeValueExpException__
diff --git a/libjava/javax/management/BadBinaryOpValueExpException.h b/libjava/javax/management/BadBinaryOpValueExpException.h
deleted file mode 100644
index 21e866be8bc..00000000000
--- a/libjava/javax/management/BadBinaryOpValueExpException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_BadBinaryOpValueExpException__
-#define __javax_management_BadBinaryOpValueExpException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class BadBinaryOpValueExpException;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::BadBinaryOpValueExpException : public ::java::lang::Exception
-{
-
-public:
-  BadBinaryOpValueExpException(::javax::management::ValueExp *);
-  virtual ::javax::management::ValueExp * getExp();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5068475589449021227LL;
-  ::javax::management::ValueExp * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) exp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_BadBinaryOpValueExpException__
diff --git a/libjava/javax/management/BadStringOperationException.h b/libjava/javax/management/BadStringOperationException.h
deleted file mode 100644
index 60c923cf71d..00000000000
--- a/libjava/javax/management/BadStringOperationException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_BadStringOperationException__
-#define __javax_management_BadStringOperationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class BadStringOperationException;
-    }
-  }
-}
-
-class javax::management::BadStringOperationException : public ::java::lang::Exception
-{
-
-public:
-  BadStringOperationException(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7802201238441662100LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) op;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_BadStringOperationException__
diff --git a/libjava/javax/management/DefaultLoaderRepository.h b/libjava/javax/management/DefaultLoaderRepository.h
deleted file mode 100644
index bdfc3fbaed1..00000000000
--- a/libjava/javax/management/DefaultLoaderRepository.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_DefaultLoaderRepository__
-#define __javax_management_DefaultLoaderRepository__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class DefaultLoaderRepository;
-    }
-  }
-}
-
-class javax::management::DefaultLoaderRepository : public ::java::lang::Object
-{
-
-public:
-  DefaultLoaderRepository();
-  static ::java::lang::Class * loadClass(::java::lang::String *);
-  static ::java::lang::Class * loadClassWithout(::java::lang::ClassLoader *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_DefaultLoaderRepository__
diff --git a/libjava/javax/management/Descriptor.h b/libjava/javax/management/Descriptor.h
deleted file mode 100644
index d8386304a60..00000000000
--- a/libjava/javax/management/Descriptor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Descriptor__
-#define __javax_management_Descriptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Descriptor;
-    }
-  }
-}
-
-class javax::management::Descriptor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual JArray< ::java::lang::String * > * getFieldNames() = 0;
-  virtual JArray< ::java::lang::String * > * getFields() = 0;
-  virtual ::java::lang::Object * getFieldValue(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::Object * > * getFieldValues(JArray< ::java::lang::String * > *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isValid() = 0;
-  virtual void removeField(::java::lang::String *) = 0;
-  virtual void setField(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void setFields(JArray< ::java::lang::String * > *, JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_Descriptor__
diff --git a/libjava/javax/management/DescriptorAccess.h b/libjava/javax/management/DescriptorAccess.h
deleted file mode 100644
index 9baf7a0a277..00000000000
--- a/libjava/javax/management/DescriptorAccess.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_DescriptorAccess__
-#define __javax_management_DescriptorAccess__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Descriptor;
-        class DescriptorAccess;
-    }
-  }
-}
-
-class javax::management::DescriptorAccess : public ::java::lang::Object
-{
-
-public:
-  virtual void setDescriptor(::javax::management::Descriptor *) = 0;
-  virtual ::javax::management::Descriptor * getDescriptor() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_DescriptorAccess__
diff --git a/libjava/javax/management/DescriptorRead.h b/libjava/javax/management/DescriptorRead.h
deleted file mode 100644
index 7552b84855d..00000000000
--- a/libjava/javax/management/DescriptorRead.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_DescriptorRead__
-#define __javax_management_DescriptorRead__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Descriptor;
-        class DescriptorRead;
-    }
-  }
-}
-
-class javax::management::DescriptorRead : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::management::Descriptor * getDescriptor() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_DescriptorRead__
diff --git a/libjava/javax/management/DynamicMBean.h b/libjava/javax/management/DynamicMBean.h
deleted file mode 100644
index 59acee1c930..00000000000
--- a/libjava/javax/management/DynamicMBean.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_DynamicMBean__
-#define __javax_management_DynamicMBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class DynamicMBean;
-        class MBeanInfo;
-    }
-  }
-}
-
-class javax::management::DynamicMBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *) = 0;
-  virtual ::javax::management::AttributeList * getAttributes(JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::management::MBeanInfo * getMBeanInfo() = 0;
-  virtual ::java::lang::Object * invoke(::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual void setAttribute(::javax::management::Attribute *) = 0;
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::AttributeList *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_DynamicMBean__
diff --git a/libjava/javax/management/InstanceAlreadyExistsException.h b/libjava/javax/management/InstanceAlreadyExistsException.h
deleted file mode 100644
index 081b838e7e3..00000000000
--- a/libjava/javax/management/InstanceAlreadyExistsException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_InstanceAlreadyExistsException__
-#define __javax_management_InstanceAlreadyExistsException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class InstanceAlreadyExistsException;
-    }
-  }
-}
-
-class javax::management::InstanceAlreadyExistsException : public ::javax::management::OperationsException
-{
-
-public:
-  InstanceAlreadyExistsException();
-  InstanceAlreadyExistsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8893743928912733931LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_InstanceAlreadyExistsException__
diff --git a/libjava/javax/management/InstanceNotFoundException.h b/libjava/javax/management/InstanceNotFoundException.h
deleted file mode 100644
index b1088deaa7f..00000000000
--- a/libjava/javax/management/InstanceNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_InstanceNotFoundException__
-#define __javax_management_InstanceNotFoundException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class InstanceNotFoundException;
-    }
-  }
-}
-
-class javax::management::InstanceNotFoundException : public ::javax::management::OperationsException
-{
-
-public:
-  InstanceNotFoundException();
-  InstanceNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -882579438394773049LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_InstanceNotFoundException__
diff --git a/libjava/javax/management/IntrospectionException.h b/libjava/javax/management/IntrospectionException.h
deleted file mode 100644
index 55621f3c72a..00000000000
--- a/libjava/javax/management/IntrospectionException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_IntrospectionException__
-#define __javax_management_IntrospectionException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class IntrospectionException;
-    }
-  }
-}
-
-class javax::management::IntrospectionException : public ::javax::management::OperationsException
-{
-
-public:
-  IntrospectionException();
-  IntrospectionException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1054516935875481725LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_IntrospectionException__
diff --git a/libjava/javax/management/InvalidApplicationException.h b/libjava/javax/management/InvalidApplicationException.h
deleted file mode 100644
index 16d11c5bd03..00000000000
--- a/libjava/javax/management/InvalidApplicationException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_InvalidApplicationException__
-#define __javax_management_InvalidApplicationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class InvalidApplicationException;
-    }
-  }
-}
-
-class javax::management::InvalidApplicationException : public ::java::lang::Exception
-{
-
-public:
-  InvalidApplicationException(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3048022274675537269LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_InvalidApplicationException__
diff --git a/libjava/javax/management/InvalidAttributeValueException.h b/libjava/javax/management/InvalidAttributeValueException.h
deleted file mode 100644
index 3439bde3bf2..00000000000
--- a/libjava/javax/management/InvalidAttributeValueException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_InvalidAttributeValueException__
-#define __javax_management_InvalidAttributeValueException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class InvalidAttributeValueException;
-    }
-  }
-}
-
-class javax::management::InvalidAttributeValueException : public ::javax::management::OperationsException
-{
-
-public:
-  InvalidAttributeValueException();
-  InvalidAttributeValueException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_InvalidAttributeValueException__
diff --git a/libjava/javax/management/JMException.h b/libjava/javax/management/JMException.h
deleted file mode 100644
index 906840006d0..00000000000
--- a/libjava/javax/management/JMException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_JMException__
-#define __javax_management_JMException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class JMException;
-    }
-  }
-}
-
-class javax::management::JMException : public ::java::lang::Exception
-{
-
-public:
-  JMException();
-  JMException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_JMException__
diff --git a/libjava/javax/management/JMRuntimeException.h b/libjava/javax/management/JMRuntimeException.h
deleted file mode 100644
index ea6dd7f2258..00000000000
--- a/libjava/javax/management/JMRuntimeException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_JMRuntimeException__
-#define __javax_management_JMRuntimeException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class JMRuntimeException;
-    }
-  }
-}
-
-class javax::management::JMRuntimeException : public ::java::lang::RuntimeException
-{
-
-public:
-  JMRuntimeException();
-  JMRuntimeException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_JMRuntimeException__
diff --git a/libjava/javax/management/JMX.h b/libjava/javax/management/JMX.h
deleted file mode 100644
index 605aaae2ff9..00000000000
--- a/libjava/javax/management/JMX.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_JMX__
-#define __javax_management_JMX__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class JMX;
-        class MBeanServerConnection;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::JMX : public ::java::lang::Object
-{
-
-  JMX();
-public:
-  static jboolean isMXBeanInterface(::java::lang::Class *);
-  static ::java::lang::Object * newMBeanProxy(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *);
-  static ::java::lang::Object * newMBeanProxy(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *, jboolean);
-  static ::java::lang::Object * newMXBeanProxy(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *);
-  static ::java::lang::Object * newMXBeanProxy(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *, jboolean);
-  static ::java::lang::String * DEFAULT_VALUE_FIELD;
-  static ::java::lang::String * IMMUTABLE_INFO_FIELD;
-  static ::java::lang::String * INTERFACE_CLASS_NAME_FIELD;
-  static ::java::lang::String * LEGAL_VALUES_FIELD;
-  static ::java::lang::String * MAX_VALUE_FIELD;
-  static ::java::lang::String * MIN_VALUE_FIELD;
-  static ::java::lang::String * MXBEAN_FIELD;
-  static ::java::lang::String * OPEN_TYPE_FIELD;
-  static ::java::lang::String * ORIGINAL_TYPE_FIELD;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_JMX__
diff --git a/libjava/javax/management/ListenerNotFoundException.h b/libjava/javax/management/ListenerNotFoundException.h
deleted file mode 100644
index ad60d6211f0..00000000000
--- a/libjava/javax/management/ListenerNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ListenerNotFoundException__
-#define __javax_management_ListenerNotFoundException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ListenerNotFoundException;
-    }
-  }
-}
-
-class javax::management::ListenerNotFoundException : public ::javax::management::OperationsException
-{
-
-public:
-  ListenerNotFoundException();
-  ListenerNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7242605822448519061LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ListenerNotFoundException__
diff --git a/libjava/javax/management/MBeanAttributeInfo.h b/libjava/javax/management/MBeanAttributeInfo.h
deleted file mode 100644
index 0a9bb73f21c..00000000000
--- a/libjava/javax/management/MBeanAttributeInfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanAttributeInfo__
-#define __javax_management_MBeanAttributeInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanAttributeInfo;
-    }
-  }
-}
-
-class javax::management::MBeanAttributeInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanAttributeInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *);
-  MBeanAttributeInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean, jboolean);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getType();
-  virtual jint hashCode();
-  virtual jboolean isIs();
-  virtual jboolean isReadable();
-  virtual jboolean isWritable();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8644704819898565848LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) attributeType;
-  jboolean isWrite;
-  jboolean isRead;
-  jboolean is;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanAttributeInfo__
diff --git a/libjava/javax/management/MBeanConstructorInfo.h b/libjava/javax/management/MBeanConstructorInfo.h
deleted file mode 100644
index 992ff8d595c..00000000000
--- a/libjava/javax/management/MBeanConstructorInfo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanConstructorInfo__
-#define __javax_management_MBeanConstructorInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanConstructorInfo;
-        class MBeanParameterInfo;
-    }
-  }
-}
-
-class javax::management::MBeanConstructorInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanConstructorInfo(::java::lang::String *, ::java::lang::reflect::Constructor *);
-  MBeanConstructorInfo(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::MBeanParameterInfo * > *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< ::javax::management::MBeanParameterInfo * > * getSignature();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4433990064191844427LL;
-  JArray< ::javax::management::MBeanParameterInfo * > * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) signature;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanConstructorInfo__
diff --git a/libjava/javax/management/MBeanException.h b/libjava/javax/management/MBeanException.h
deleted file mode 100644
index 17ff2a7addd..00000000000
--- a/libjava/javax/management/MBeanException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanException__
-#define __javax_management_MBeanException__
-
-#pragma interface
-
-#include <javax/management/JMException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanException;
-    }
-  }
-}
-
-class javax::management::MBeanException : public ::javax::management::JMException
-{
-
-public:
-  MBeanException(::java::lang::Exception *);
-  MBeanException(::java::lang::Exception *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Exception * getTargetException();
-private:
-  static const jlong serialVersionUID = 4066342430588744142LL;
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::javax::management::JMException)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanException__
diff --git a/libjava/javax/management/MBeanFeatureInfo.h b/libjava/javax/management/MBeanFeatureInfo.h
deleted file mode 100644
index 7675ec6740f..00000000000
--- a/libjava/javax/management/MBeanFeatureInfo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanFeatureInfo__
-#define __javax_management_MBeanFeatureInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanFeatureInfo;
-    }
-  }
-}
-
-class javax::management::MBeanFeatureInfo : public ::java::lang::Object
-{
-
-public:
-  MBeanFeatureInfo(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getName();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 3952882688968447265LL;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) description;
-  ::java::lang::String * name;
-public: // actually package-private
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanFeatureInfo__
diff --git a/libjava/javax/management/MBeanInfo.h b/libjava/javax/management/MBeanInfo.h
deleted file mode 100644
index cecc12f2889..00000000000
--- a/libjava/javax/management/MBeanInfo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanInfo__
-#define __javax_management_MBeanInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanAttributeInfo;
-        class MBeanConstructorInfo;
-        class MBeanInfo;
-        class MBeanNotificationInfo;
-        class MBeanOperationInfo;
-    }
-  }
-}
-
-class javax::management::MBeanInfo : public ::java::lang::Object
-{
-
-public:
-  MBeanInfo(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::MBeanAttributeInfo * > *, JArray< ::javax::management::MBeanConstructorInfo * > *, JArray< ::javax::management::MBeanOperationInfo * > *, JArray< ::javax::management::MBeanNotificationInfo * > *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< ::javax::management::MBeanAttributeInfo * > * getAttributes();
-  virtual ::java::lang::String * getClassName();
-  virtual JArray< ::javax::management::MBeanConstructorInfo * > * getConstructors();
-  virtual ::java::lang::String * getDescription();
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotifications();
-  virtual JArray< ::javax::management::MBeanOperationInfo * > * getOperations();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6451021435135161911LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) description;
-  ::java::lang::String * className;
-  JArray< ::javax::management::MBeanAttributeInfo * > * attributes;
-  JArray< ::javax::management::MBeanOperationInfo * > * operations;
-  JArray< ::javax::management::MBeanConstructorInfo * > * constructors;
-  JArray< ::javax::management::MBeanNotificationInfo * > * notifications;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanInfo__
diff --git a/libjava/javax/management/MBeanNotificationInfo.h b/libjava/javax/management/MBeanNotificationInfo.h
deleted file mode 100644
index 25e99c3c1ed..00000000000
--- a/libjava/javax/management/MBeanNotificationInfo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanNotificationInfo__
-#define __javax_management_MBeanNotificationInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-    }
-  }
-}
-
-class javax::management::MBeanNotificationInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanNotificationInfo(JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< ::java::lang::String * > * getNotifTypes();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3888371564530107064LL;
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) types;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanNotificationInfo__
diff --git a/libjava/javax/management/MBeanOperationInfo.h b/libjava/javax/management/MBeanOperationInfo.h
deleted file mode 100644
index 97d0cd5c53f..00000000000
--- a/libjava/javax/management/MBeanOperationInfo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanOperationInfo__
-#define __javax_management_MBeanOperationInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanOperationInfo;
-        class MBeanParameterInfo;
-    }
-  }
-}
-
-class javax::management::MBeanOperationInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanOperationInfo(::java::lang::String *, ::java::lang::reflect::Method *);
-  MBeanOperationInfo(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::MBeanParameterInfo * > *, ::java::lang::String *, jint);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint getImpact();
-  virtual ::java::lang::String * getReturnType();
-  virtual JArray< ::javax::management::MBeanParameterInfo * > * getSignature();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6178860474881375330LL;
-public:
-  static const jint INFO = 0;
-  static const jint ACTION = 1;
-  static const jint ACTION_INFO = 2;
-  static const jint UNKNOWN = 3;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) type;
-  JArray< ::javax::management::MBeanParameterInfo * > * signature;
-  jint impact;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanOperationInfo__
diff --git a/libjava/javax/management/MBeanParameterInfo.h b/libjava/javax/management/MBeanParameterInfo.h
deleted file mode 100644
index 3186814594a..00000000000
--- a/libjava/javax/management/MBeanParameterInfo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanParameterInfo__
-#define __javax_management_MBeanParameterInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanParameterInfo;
-    }
-  }
-}
-
-class javax::management::MBeanParameterInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanParameterInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getType();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7432616882776782338LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanParameterInfo__
diff --git a/libjava/javax/management/MBeanPermission$NameHolder.h b/libjava/javax/management/MBeanPermission$NameHolder.h
deleted file mode 100644
index 810a8ce5441..00000000000
--- a/libjava/javax/management/MBeanPermission$NameHolder.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanPermission$NameHolder__
-#define __javax_management_MBeanPermission$NameHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanPermission;
-        class MBeanPermission$NameHolder;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanPermission$NameHolder : public ::java::lang::Object
-{
-
-public:
-  MBeanPermission$NameHolder(::javax::management::MBeanPermission *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getMember();
-  virtual ::javax::management::ObjectName * getObjectName();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) className;
-  ::java::lang::String * member;
-  ::javax::management::ObjectName * objectName;
-public: // actually package-private
-  ::javax::management::MBeanPermission * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanPermission$NameHolder__
diff --git a/libjava/javax/management/MBeanPermission.h b/libjava/javax/management/MBeanPermission.h
deleted file mode 100644
index a0c7951fd5a..00000000000
--- a/libjava/javax/management/MBeanPermission.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanPermission__
-#define __javax_management_MBeanPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanPermission;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanPermission : public ::java::security::Permission
-{
-
-public:
-  MBeanPermission(::java::lang::String *, ::java::lang::String *);
-  MBeanPermission(::java::lang::String *, ::java::lang::String *, ::javax::management::ObjectName *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getActions();
-  virtual jint hashCode();
-  virtual jboolean implies(::java::security::Permission *);
-private:
-  void updateActionSet();
-  void readObject(::java::io::ObjectInputStream *);
-  void checkActions();
-  static const jlong serialVersionUID = -2416928705275160661LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::Permission)))) actions;
-  ::java::util::Set * actionSet;
-  static ::java::util::Set * validSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanPermission__
diff --git a/libjava/javax/management/MBeanRegistration.h b/libjava/javax/management/MBeanRegistration.h
deleted file mode 100644
index b1faba2fefb..00000000000
--- a/libjava/javax/management/MBeanRegistration.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanRegistration__
-#define __javax_management_MBeanRegistration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanRegistration;
-        class MBeanServer;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanRegistration : public ::java::lang::Object
-{
-
-public:
-  virtual void postDeregister() = 0;
-  virtual void postRegister(::java::lang::Boolean *) = 0;
-  virtual void preDeregister() = 0;
-  virtual ::javax::management::ObjectName * preRegister(::javax::management::MBeanServer *, ::javax::management::ObjectName *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MBeanRegistration__
diff --git a/libjava/javax/management/MBeanRegistrationException.h b/libjava/javax/management/MBeanRegistrationException.h
deleted file mode 100644
index 4cd0266e25e..00000000000
--- a/libjava/javax/management/MBeanRegistrationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanRegistrationException__
-#define __javax_management_MBeanRegistrationException__
-
-#pragma interface
-
-#include <javax/management/MBeanException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanRegistrationException;
-    }
-  }
-}
-
-class javax::management::MBeanRegistrationException : public ::javax::management::MBeanException
-{
-
-public:
-  MBeanRegistrationException(::java::lang::Exception *);
-  MBeanRegistrationException(::java::lang::Exception *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4482382455277067805LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanRegistrationException__
diff --git a/libjava/javax/management/MBeanServer.h b/libjava/javax/management/MBeanServer.h
deleted file mode 100644
index 9971d5c5927..00000000000
--- a/libjava/javax/management/MBeanServer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServer__
-#define __javax_management_MBeanServer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class MBeanInfo;
-        class MBeanServer;
-        class NotificationFilter;
-        class NotificationListener;
-        class ObjectInstance;
-        class ObjectName;
-        class QueryExp;
-      namespace loading
-      {
-          class ClassLoaderRepository;
-      }
-    }
-  }
-}
-
-class javax::management::MBeanServer : public ::java::lang::Object
-{
-
-public:
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::io::ObjectInputStream * deserialize(::javax::management::ObjectName *, JArray< jbyte > *) = 0;
-  virtual ::java::io::ObjectInputStream * deserialize(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual ::java::io::ObjectInputStream * deserialize(::java::lang::String *, ::javax::management::ObjectName *, JArray< jbyte > *) = 0;
-  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *, ::java::lang::String *) = 0;
-  virtual ::javax::management::AttributeList * getAttributes(::javax::management::ObjectName *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::ClassLoader * getClassLoader(::javax::management::ObjectName *) = 0;
-  virtual ::java::lang::ClassLoader * getClassLoaderFor(::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::loading::ClassLoaderRepository * getClassLoaderRepository() = 0;
-  virtual ::java::lang::String * getDefaultDomain() = 0;
-  virtual JArray< ::java::lang::String * > * getDomains() = 0;
-  virtual ::java::lang::Integer * getMBeanCount() = 0;
-  virtual ::javax::management::MBeanInfo * getMBeanInfo(::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * getObjectInstance(::javax::management::ObjectName *) = 0;
-  virtual ::java::lang::Object * instantiate(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, ::javax::management::ObjectName *) = 0;
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::Object * invoke(::javax::management::ObjectName *, ::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean isInstanceOf(::javax::management::ObjectName *, ::java::lang::String *) = 0;
-  virtual jboolean isRegistered(::javax::management::ObjectName *) = 0;
-  virtual ::java::util::Set * queryMBeans(::javax::management::ObjectName *, ::javax::management::QueryExp *) = 0;
-  virtual ::java::util::Set * queryNames(::javax::management::ObjectName *, ::javax::management::QueryExp *) = 0;
-  virtual ::javax::management::ObjectInstance * registerMBean(::java::lang::Object *, ::javax::management::ObjectName *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void setAttribute(::javax::management::ObjectName *, ::javax::management::Attribute *) = 0;
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::ObjectName *, ::javax::management::AttributeList *) = 0;
-  virtual void unregisterMBean(::javax::management::ObjectName *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MBeanServer__
diff --git a/libjava/javax/management/MBeanServerBuilder.h b/libjava/javax/management/MBeanServerBuilder.h
deleted file mode 100644
index c0dc95dd46f..00000000000
--- a/libjava/javax/management/MBeanServerBuilder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerBuilder__
-#define __javax_management_MBeanServerBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class MBeanServerBuilder;
-        class MBeanServerDelegate;
-    }
-  }
-}
-
-class javax::management::MBeanServerBuilder : public ::java::lang::Object
-{
-
-public:
-  MBeanServerBuilder();
-  virtual ::javax::management::MBeanServer * newMBeanServer(::java::lang::String *, ::javax::management::MBeanServer *, ::javax::management::MBeanServerDelegate *);
-  virtual ::javax::management::MBeanServerDelegate * newMBeanServerDelegate();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerBuilder__
diff --git a/libjava/javax/management/MBeanServerConnection.h b/libjava/javax/management/MBeanServerConnection.h
deleted file mode 100644
index 10759ab89d7..00000000000
--- a/libjava/javax/management/MBeanServerConnection.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerConnection__
-#define __javax_management_MBeanServerConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class MBeanInfo;
-        class MBeanServerConnection;
-        class NotificationFilter;
-        class NotificationListener;
-        class ObjectInstance;
-        class ObjectName;
-        class QueryExp;
-    }
-  }
-}
-
-class javax::management::MBeanServerConnection : public ::java::lang::Object
-{
-
-public:
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *, ::java::lang::String *) = 0;
-  virtual ::javax::management::AttributeList * getAttributes(::javax::management::ObjectName *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::String * getDefaultDomain() = 0;
-  virtual JArray< ::java::lang::String * > * getDomains() = 0;
-  virtual ::java::lang::Integer * getMBeanCount() = 0;
-  virtual ::javax::management::MBeanInfo * getMBeanInfo(::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * getObjectInstance(::javax::management::ObjectName *) = 0;
-  virtual ::java::lang::Object * invoke(::javax::management::ObjectName *, ::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean isInstanceOf(::javax::management::ObjectName *, ::java::lang::String *) = 0;
-  virtual jboolean isRegistered(::javax::management::ObjectName *) = 0;
-  virtual ::java::util::Set * queryMBeans(::javax::management::ObjectName *, ::javax::management::QueryExp *) = 0;
-  virtual ::java::util::Set * queryNames(::javax::management::ObjectName *, ::javax::management::QueryExp *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void setAttribute(::javax::management::ObjectName *, ::javax::management::Attribute *) = 0;
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::ObjectName *, ::javax::management::AttributeList *) = 0;
-  virtual void unregisterMBean(::javax::management::ObjectName *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MBeanServerConnection__
diff --git a/libjava/javax/management/MBeanServerDelegate.h b/libjava/javax/management/MBeanServerDelegate.h
deleted file mode 100644
index 4c97feb4796..00000000000
--- a/libjava/javax/management/MBeanServerDelegate.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerDelegate__
-#define __javax_management_MBeanServerDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-        class MBeanServerDelegate;
-        class Notification;
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::MBeanServerDelegate : public ::java::lang::Object
-{
-
-public:
-  MBeanServerDelegate();
-  virtual void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual ::java::lang::String * getImplementationName();
-  virtual ::java::lang::String * getImplementationVendor();
-  virtual ::java::lang::String * getImplementationVersion();
-  virtual ::java::lang::String * getMBeanServerId();
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo();
-  virtual ::java::lang::String * getSpecificationName();
-  virtual ::java::lang::String * getSpecificationVendor();
-  virtual ::java::lang::String * getSpecificationVersion();
-  virtual void removeNotificationListener(::javax::management::NotificationListener *);
-  virtual void removeNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual void sendNotification(::javax::management::Notification *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::util::List * listeners;
-  jlong seqNo;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerDelegate__
diff --git a/libjava/javax/management/MBeanServerDelegateMBean.h b/libjava/javax/management/MBeanServerDelegateMBean.h
deleted file mode 100644
index 967dca872f4..00000000000
--- a/libjava/javax/management/MBeanServerDelegateMBean.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerDelegateMBean__
-#define __javax_management_MBeanServerDelegateMBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerDelegateMBean;
-    }
-  }
-}
-
-class javax::management::MBeanServerDelegateMBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getImplementationName() = 0;
-  virtual ::java::lang::String * getImplementationVendor() = 0;
-  virtual ::java::lang::String * getImplementationVersion() = 0;
-  virtual ::java::lang::String * getMBeanServerId() = 0;
-  virtual ::java::lang::String * getSpecificationName() = 0;
-  virtual ::java::lang::String * getSpecificationVendor() = 0;
-  virtual ::java::lang::String * getSpecificationVersion() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MBeanServerDelegateMBean__
diff --git a/libjava/javax/management/MBeanServerFactory.h b/libjava/javax/management/MBeanServerFactory.h
deleted file mode 100644
index e9df36e5076..00000000000
--- a/libjava/javax/management/MBeanServerFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerFactory__
-#define __javax_management_MBeanServerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class MBeanServerBuilder;
-        class MBeanServerFactory;
-      namespace loading
-      {
-          class ClassLoaderRepository;
-      }
-    }
-  }
-}
-
-class javax::management::MBeanServerFactory : public ::java::lang::Object
-{
-
-  MBeanServerFactory();
-public:
-  static ::javax::management::MBeanServer * createMBeanServer();
-  static ::javax::management::MBeanServer * createMBeanServer(::java::lang::String *);
-  static ::java::util::ArrayList * findMBeanServer(::java::lang::String *);
-  static ::javax::management::loading::ClassLoaderRepository * getClassLoaderRepository(::javax::management::MBeanServer *);
-  static ::javax::management::MBeanServer * newMBeanServer();
-  static ::javax::management::MBeanServer * newMBeanServer(::java::lang::String *);
-private:
-  static ::javax::management::MBeanServer * createServer(::java::lang::String *);
-public:
-  static void releaseMBeanServer(::javax::management::MBeanServer *);
-private:
-  static ::javax::management::MBeanServerBuilder * builder;
-  static ::java::util::Map * servers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerFactory__
diff --git a/libjava/javax/management/MBeanServerInvocationHandler.h b/libjava/javax/management/MBeanServerInvocationHandler.h
deleted file mode 100644
index d2ac83120d7..00000000000
--- a/libjava/javax/management/MBeanServerInvocationHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerInvocationHandler__
-#define __javax_management_MBeanServerInvocationHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerConnection;
-        class MBeanServerInvocationHandler;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanServerInvocationHandler : public ::java::lang::Object
-{
-
-public:
-  MBeanServerInvocationHandler(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *);
-  MBeanServerInvocationHandler(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, jboolean);
-  virtual ::javax::management::MBeanServerConnection * getMBeanServerConnection();
-  virtual ::javax::management::ObjectName * getObjectName();
-  virtual ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
-  virtual jboolean isMXBean();
-  static ::java::lang::Object * newProxyInstance(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *, jboolean);
-private:
-  jboolean inInterface(::java::lang::String *, ::java::lang::Class *, JArray< ::java::lang::Class * > *);
-  ::javax::management::MBeanServerConnection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) conn;
-  ::javax::management::ObjectName * name;
-  jboolean mxBean;
-  ::java::lang::Class * iface;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerInvocationHandler__
diff --git a/libjava/javax/management/MBeanServerNotification.h b/libjava/javax/management/MBeanServerNotification.h
deleted file mode 100644
index 11a7203c5d5..00000000000
--- a/libjava/javax/management/MBeanServerNotification.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerNotification__
-#define __javax_management_MBeanServerNotification__
-
-#pragma interface
-
-#include <javax/management/Notification.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerNotification;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanServerNotification : public ::javax::management::Notification
-{
-
-public:
-  MBeanServerNotification(::java::lang::String *, ::java::lang::Object *, jlong, ::javax::management::ObjectName *);
-  virtual ::javax::management::ObjectName * getMBeanName();
-private:
-  static const jlong serialVersionUID = 2876477500475969677LL;
-public:
-  static ::java::lang::String * REGISTRATION_NOTIFICATION;
-  static ::java::lang::String * UNREGISTRATION_NOTIFICATION;
-private:
-  ::javax::management::ObjectName * __attribute__((aligned(__alignof__( ::javax::management::Notification)))) objectName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerNotification__
diff --git a/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.h b/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.h
deleted file mode 100644
index 0e325fed7e4..00000000000
--- a/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration__
-#define __javax_management_MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerPermission;
-        class MBeanServerPermission$MBeanServerPermissionCollection;
-        class MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration;
-    }
-  }
-}
-
-class javax::management::MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration : public ::java::lang::Object
-{
-
-public:
-  MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration(::javax::management::MBeanServerPermission$MBeanServerPermissionCollection *, ::javax::management::MBeanServerPermission *);
-  virtual jboolean hasMoreElements();
-  virtual ::java::security::Permission * MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration$nextElement();
-  virtual ::java::lang::Object * nextElement();
-private:
-  ::javax::management::MBeanServerPermission * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  jboolean done;
-public: // actually package-private
-  ::javax::management::MBeanServerPermission$MBeanServerPermissionCollection * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration__
diff --git a/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.h b/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.h
deleted file mode 100644
index 61223449118..00000000000
--- a/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerPermission$MBeanServerPermissionCollection__
-#define __javax_management_MBeanServerPermission$MBeanServerPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerPermission;
-        class MBeanServerPermission$MBeanServerPermissionCollection;
-    }
-  }
-}
-
-class javax::management::MBeanServerPermission$MBeanServerPermissionCollection : public ::java::security::PermissionCollection
-{
-
-  MBeanServerPermission$MBeanServerPermissionCollection(::javax::management::MBeanServerPermission *);
-public:
-  virtual void add(::java::security::Permission *);
-  virtual ::java::util::Enumeration * elements();
-  virtual jboolean implies(::java::security::Permission *);
-public: // actually package-private
-  MBeanServerPermission$MBeanServerPermissionCollection(::javax::management::MBeanServerPermission *, ::javax::management::MBeanServerPermission$MBeanServerPermissionCollection *);
-private:
-  static const jlong serialVersionUID = -5661980843569388590LL;
-  ::javax::management::MBeanServerPermission * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) collectionPermission;
-public: // actually package-private
-  ::javax::management::MBeanServerPermission * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerPermission$MBeanServerPermissionCollection__
diff --git a/libjava/javax/management/MBeanServerPermission.h b/libjava/javax/management/MBeanServerPermission.h
deleted file mode 100644
index b2bdc1908e3..00000000000
--- a/libjava/javax/management/MBeanServerPermission.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerPermission__
-#define __javax_management_MBeanServerPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerPermission;
-    }
-  }
-}
-
-class javax::management::MBeanServerPermission : public ::java::security::BasicPermission
-{
-
-public:
-  MBeanServerPermission(::java::lang::String *);
-  MBeanServerPermission(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static ::java::lang::String * checkName(::java::lang::String *);
-  static const jlong serialVersionUID = -5661980843569388590LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerPermission__
diff --git a/libjava/javax/management/MBeanTrustPermission.h b/libjava/javax/management/MBeanTrustPermission.h
deleted file mode 100644
index a9740097035..00000000000
--- a/libjava/javax/management/MBeanTrustPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanTrustPermission__
-#define __javax_management_MBeanTrustPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanTrustPermission;
-    }
-  }
-}
-
-class javax::management::MBeanTrustPermission : public ::java::security::BasicPermission
-{
-
-public:
-  MBeanTrustPermission(::java::lang::String *);
-  MBeanTrustPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2952178077029018140LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanTrustPermission__
diff --git a/libjava/javax/management/MXBean.h b/libjava/javax/management/MXBean.h
deleted file mode 100644
index 58e72395927..00000000000
--- a/libjava/javax/management/MXBean.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MXBean__
-#define __javax_management_MXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MXBean;
-    }
-  }
-}
-
-class javax::management::MXBean : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean value() = 0;
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MXBean__
diff --git a/libjava/javax/management/MalformedObjectNameException.h b/libjava/javax/management/MalformedObjectNameException.h
deleted file mode 100644
index 202fa205182..00000000000
--- a/libjava/javax/management/MalformedObjectNameException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MalformedObjectNameException__
-#define __javax_management_MalformedObjectNameException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MalformedObjectNameException;
-    }
-  }
-}
-
-class javax::management::MalformedObjectNameException : public ::javax::management::OperationsException
-{
-
-public:
-  MalformedObjectNameException();
-  MalformedObjectNameException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -572689714442915824LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MalformedObjectNameException__
diff --git a/libjava/javax/management/NotCompliantMBeanException.h b/libjava/javax/management/NotCompliantMBeanException.h
deleted file mode 100644
index 132f1133138..00000000000
--- a/libjava/javax/management/NotCompliantMBeanException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotCompliantMBeanException__
-#define __javax_management_NotCompliantMBeanException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class NotCompliantMBeanException;
-    }
-  }
-}
-
-class javax::management::NotCompliantMBeanException : public ::javax::management::OperationsException
-{
-
-public:
-  NotCompliantMBeanException();
-  NotCompliantMBeanException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5175579583207963577LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_NotCompliantMBeanException__
diff --git a/libjava/javax/management/Notification.h b/libjava/javax/management/Notification.h
deleted file mode 100644
index c0d096d0773..00000000000
--- a/libjava/javax/management/Notification.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Notification__
-#define __javax_management_Notification__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-    }
-  }
-}
-
-class javax::management::Notification : public ::java::util::EventObject
-{
-
-public:
-  Notification(::java::lang::String *, ::java::lang::Object *, jlong);
-  Notification(::java::lang::String *, ::java::lang::Object *, jlong, jlong);
-  Notification(::java::lang::String *, ::java::lang::Object *, jlong, jlong, ::java::lang::String *);
-  Notification(::java::lang::String *, ::java::lang::Object *, jlong, ::java::lang::String *);
-  virtual ::java::lang::String * getMessage();
-  virtual jlong getSequenceNumber();
-  virtual jlong getTimeStamp();
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::Object * getUserData();
-  virtual void setSequenceNumber(jlong);
-  virtual void setSource(::java::lang::Object *);
-  virtual void setTimeStamp(jlong);
-  virtual void setUserData(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -7516092053498031989LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) message;
-  jlong sequenceNumber;
-public: // actually protected
-  ::java::lang::Object * source;
-private:
-  jlong timeStamp;
-  ::java::lang::String * type;
-  ::java::lang::Object * userData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Notification__
diff --git a/libjava/javax/management/NotificationBroadcaster.h b/libjava/javax/management/NotificationBroadcaster.h
deleted file mode 100644
index 0cd53dc61c0..00000000000
--- a/libjava/javax/management/NotificationBroadcaster.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationBroadcaster__
-#define __javax_management_NotificationBroadcaster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-        class NotificationBroadcaster;
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::NotificationBroadcaster : public ::java::lang::Object
-{
-
-public:
-  virtual void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo() = 0;
-  virtual void removeNotificationListener(::javax::management::NotificationListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_NotificationBroadcaster__
diff --git a/libjava/javax/management/NotificationBroadcasterSupport$DispatchTask.h b/libjava/javax/management/NotificationBroadcasterSupport$DispatchTask.h
deleted file mode 100644
index af6dbaccba1..00000000000
--- a/libjava/javax/management/NotificationBroadcasterSupport$DispatchTask.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationBroadcasterSupport$DispatchTask__
-#define __javax_management_NotificationBroadcasterSupport$DispatchTask__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace management
-      {
-          class ListenerData;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-        class NotificationBroadcasterSupport;
-        class NotificationBroadcasterSupport$DispatchTask;
-    }
-  }
-}
-
-class javax::management::NotificationBroadcasterSupport$DispatchTask : public ::java::lang::Object
-{
-
-public:
-  NotificationBroadcasterSupport$DispatchTask(::javax::management::NotificationBroadcasterSupport *, ::gnu::javax::management::ListenerData *, ::javax::management::Notification *);
-  void run();
-private:
-  ::gnu::javax::management::ListenerData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ldata;
-  ::javax::management::Notification * notif;
-public: // actually package-private
-  ::javax::management::NotificationBroadcasterSupport * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_NotificationBroadcasterSupport$DispatchTask__
diff --git a/libjava/javax/management/NotificationBroadcasterSupport.h b/libjava/javax/management/NotificationBroadcasterSupport.h
deleted file mode 100644
index cea1aa3be0b..00000000000
--- a/libjava/javax/management/NotificationBroadcasterSupport.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationBroadcasterSupport__
-#define __javax_management_NotificationBroadcasterSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-        class Notification;
-        class NotificationBroadcasterSupport;
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::NotificationBroadcasterSupport : public ::java::lang::Object
-{
-
-public:
-  NotificationBroadcasterSupport();
-  NotificationBroadcasterSupport(::java::util::concurrent::Executor *);
-  NotificationBroadcasterSupport(JArray< ::javax::management::MBeanNotificationInfo * > *);
-  NotificationBroadcasterSupport(::java::util::concurrent::Executor *, JArray< ::javax::management::MBeanNotificationInfo * > *);
-  virtual void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo();
-public: // actually protected
-  virtual void handleNotification(::javax::management::NotificationListener *, ::javax::management::Notification *, ::java::lang::Object *);
-public:
-  virtual void removeNotificationListener(::javax::management::NotificationListener *);
-  virtual void removeNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual void sendNotification(::javax::management::Notification *);
-private:
-  ::java::util::concurrent::Executor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) executor;
-  JArray< ::javax::management::MBeanNotificationInfo * > * info;
-  ::java::util::List * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_NotificationBroadcasterSupport__
diff --git a/libjava/javax/management/NotificationEmitter.h b/libjava/javax/management/NotificationEmitter.h
deleted file mode 100644
index 2bdebc654b4..00000000000
--- a/libjava/javax/management/NotificationEmitter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationEmitter__
-#define __javax_management_NotificationEmitter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-        class NotificationEmitter;
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::NotificationEmitter : public ::java::lang::Object
-{
-
-public:
-  virtual void removeNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo() = 0;
-  virtual void removeNotificationListener(::javax::management::NotificationListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_NotificationEmitter__
diff --git a/libjava/javax/management/NotificationFilter.h b/libjava/javax/management/NotificationFilter.h
deleted file mode 100644
index b65b1b13b3f..00000000000
--- a/libjava/javax/management/NotificationFilter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationFilter__
-#define __javax_management_NotificationFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-        class NotificationFilter;
-    }
-  }
-}
-
-class javax::management::NotificationFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isNotificationEnabled(::javax::management::Notification *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_NotificationFilter__
diff --git a/libjava/javax/management/NotificationFilterSupport.h b/libjava/javax/management/NotificationFilterSupport.h
deleted file mode 100644
index f1ae48a6807..00000000000
--- a/libjava/javax/management/NotificationFilterSupport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationFilterSupport__
-#define __javax_management_NotificationFilterSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-        class NotificationFilterSupport;
-    }
-  }
-}
-
-class javax::management::NotificationFilterSupport : public ::java::lang::Object
-{
-
-public:
-  NotificationFilterSupport();
-  virtual void disableAllTypes();
-  virtual void disableType(::java::lang::String *);
-  virtual void enableType(::java::lang::String *);
-  virtual ::java::util::Vector * getEnabledTypes();
-  virtual jboolean isNotificationEnabled(::javax::management::Notification *);
-private:
-  static const jlong serialVersionUID = 6579080007561786969LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabledTypes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_NotificationFilterSupport__
diff --git a/libjava/javax/management/NotificationListener.h b/libjava/javax/management/NotificationListener.h
deleted file mode 100644
index 9561e10be06..00000000000
--- a/libjava/javax/management/NotificationListener.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationListener__
-#define __javax_management_NotificationListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::NotificationListener : public ::java::lang::Object
-{
-
-public:
-  virtual void handleNotification(::javax::management::Notification *, ::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_NotificationListener__
diff --git a/libjava/javax/management/ObjectInstance.h b/libjava/javax/management/ObjectInstance.h
deleted file mode 100644
index 43755ef44f6..00000000000
--- a/libjava/javax/management/ObjectInstance.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ObjectInstance__
-#define __javax_management_ObjectInstance__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectInstance;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::ObjectInstance : public ::java::lang::Object
-{
-
-public:
-  ObjectInstance(::javax::management::ObjectName *, ::java::lang::String *);
-  ObjectInstance(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getClassName();
-  virtual ::javax::management::ObjectName * getObjectName();
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = -4099952623687795850LL;
-  ::javax::management::ObjectName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ObjectInstance__
diff --git a/libjava/javax/management/ObjectName.h b/libjava/javax/management/ObjectName.h
deleted file mode 100644
index d4288807e50..00000000000
--- a/libjava/javax/management/ObjectName.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ObjectName__
-#define __javax_management_ObjectName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::ObjectName : public ::java::lang::Object
-{
-
-public:
-  ObjectName(::java::lang::String *);
-private:
-  void parse(::java::lang::String *);
-public:
-  ObjectName(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ObjectName(::java::lang::String *, ::java::util::Hashtable *);
-private:
-  void checkComponents();
-public:
-  virtual jboolean apply(::javax::management::ObjectName *);
-private:
-  static jboolean domainMatches(::java::lang::String *, jint, ::java::lang::String *, jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getCanonicalKeyPropertyListString();
-  virtual ::java::lang::String * getCanonicalName();
-  virtual ::java::lang::String * getDomain();
-  static ::javax::management::ObjectName * getInstance(::javax::management::ObjectName *);
-  static ::javax::management::ObjectName * getInstance(::java::lang::String *);
-  static ::javax::management::ObjectName * getInstance(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::javax::management::ObjectName * getInstance(::java::lang::String *, ::java::util::Hashtable *);
-  virtual ::java::lang::String * getKeyProperty(::java::lang::String *);
-  virtual ::java::util::Hashtable * getKeyPropertyList();
-  virtual ::java::lang::String * getKeyPropertyListString();
-  virtual jint hashCode();
-  virtual jboolean isDomainPattern();
-  virtual jboolean isPattern();
-  virtual jboolean isPropertyPattern();
-  virtual jboolean isPropertyListPattern();
-  virtual jboolean isPropertyValuePattern();
-  virtual jboolean isPropertyValuePattern(::java::lang::String *);
-  static ::java::lang::String * quote(::java::lang::String *);
-  virtual void setMBeanServer(::javax::management::MBeanServer *);
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  static ::java::lang::String * unquote(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1081892073854801359LL;
-public:
-  static ::javax::management::ObjectName * WILDCARD;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) domain;
-  ::java::util::TreeMap * properties;
-  ::java::lang::String * propertyListString;
-  jboolean propertyListPattern;
-  jboolean propertyValuePattern;
-  ::javax::management::MBeanServer * server;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ObjectName__
diff --git a/libjava/javax/management/OperationsException.h b/libjava/javax/management/OperationsException.h
deleted file mode 100644
index 528e0600f68..00000000000
--- a/libjava/javax/management/OperationsException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_OperationsException__
-#define __javax_management_OperationsException__
-
-#pragma interface
-
-#include <javax/management/JMException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class OperationsException;
-    }
-  }
-}
-
-class javax::management::OperationsException : public ::javax::management::JMException
-{
-
-public:
-  OperationsException();
-  OperationsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4967597595580536216LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_OperationsException__
diff --git a/libjava/javax/management/PersistentMBean.h b/libjava/javax/management/PersistentMBean.h
deleted file mode 100644
index e11651bf986..00000000000
--- a/libjava/javax/management/PersistentMBean.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_PersistentMBean__
-#define __javax_management_PersistentMBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class PersistentMBean;
-    }
-  }
-}
-
-class javax::management::PersistentMBean : public ::java::lang::Object
-{
-
-public:
-  virtual void load() = 0;
-  virtual void store() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_PersistentMBean__
diff --git a/libjava/javax/management/Query$AndQueryExp.h b/libjava/javax/management/Query$AndQueryExp.h
deleted file mode 100644
index 425690e694a..00000000000
--- a/libjava/javax/management/Query$AndQueryExp.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$AndQueryExp__
-#define __javax_management_Query$AndQueryExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$AndQueryExp;
-        class QueryExp;
-    }
-  }
-}
-
-class javax::management::Query$AndQueryExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$AndQueryExp(::javax::management::QueryExp *, ::javax::management::QueryExp *);
-  jboolean apply(::javax::management::ObjectName *);
-private:
-  static const jlong serialVersionUID = -1081892073854801359LL;
-  ::javax::management::QueryExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp1;
-  ::javax::management::QueryExp * exp2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$AndQueryExp__
diff --git a/libjava/javax/management/Query$BetweenQueryExp.h b/libjava/javax/management/Query$BetweenQueryExp.h
deleted file mode 100644
index 143a3b44e45..00000000000
--- a/libjava/javax/management/Query$BetweenQueryExp.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$BetweenQueryExp__
-#define __javax_management_Query$BetweenQueryExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$BetweenQueryExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query$BetweenQueryExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$BetweenQueryExp(::javax::management::ValueExp *, ::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  jboolean apply(::javax::management::ObjectName *);
-private:
-  static const jlong serialVersionUID = -2933597532866307444LL;
-  ::javax::management::ValueExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp1;
-  ::javax::management::ValueExp * exp2;
-  ::javax::management::ValueExp * exp3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$BetweenQueryExp__
diff --git a/libjava/javax/management/Query$BinaryOpValueExp.h b/libjava/javax/management/Query$BinaryOpValueExp.h
deleted file mode 100644
index 7462caf112f..00000000000
--- a/libjava/javax/management/Query$BinaryOpValueExp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$BinaryOpValueExp__
-#define __javax_management_Query$BinaryOpValueExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$BinaryOpValueExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query$BinaryOpValueExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$BinaryOpValueExp(jint, ::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 1216286847881456786LL;
-  jint __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) op;
-  ::javax::management::ValueExp * exp1;
-  ::javax::management::ValueExp * exp2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$BinaryOpValueExp__
diff --git a/libjava/javax/management/Query$BinaryRelQueryExp.h b/libjava/javax/management/Query$BinaryRelQueryExp.h
deleted file mode 100644
index 4d59923250a..00000000000
--- a/libjava/javax/management/Query$BinaryRelQueryExp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$BinaryRelQueryExp__
-#define __javax_management_Query$BinaryRelQueryExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$BinaryRelQueryExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query$BinaryRelQueryExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$BinaryRelQueryExp(jint, ::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  jboolean apply(::javax::management::ObjectName *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5690656271650491000LL;
-  jint __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) relOp;
-  ::javax::management::ValueExp * exp1;
-  ::javax::management::ValueExp * exp2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$BinaryRelQueryExp__
diff --git a/libjava/javax/management/Query$BooleanValueExp.h b/libjava/javax/management/Query$BooleanValueExp.h
deleted file mode 100644
index d8e175f2a40..00000000000
--- a/libjava/javax/management/Query$BooleanValueExp.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$BooleanValueExp__
-#define __javax_management_Query$BooleanValueExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$BooleanValueExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query$BooleanValueExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$BooleanValueExp(jboolean);
-  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7754922052666594581LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$BooleanValueExp__
diff --git a/libjava/javax/management/Query$ClassAttributeValueExp.h b/libjava/javax/management/Query$ClassAttributeValueExp.h
deleted file mode 100644
index d967ccf83e6..00000000000
--- a/libjava/javax/management/Query$ClassAttributeValueExp.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$ClassAttributeValueExp__
-#define __javax_management_Query$ClassAttributeValueExp__
-
-#pragma interface
-
-#include <javax/management/AttributeValueExp.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$ClassAttributeValueExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query$ClassAttributeValueExp : public ::javax::management::AttributeValueExp
-{
-
-  Query$ClassAttributeValueExp();
-public:
-  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
-public: // actually package-private
-  Query$ClassAttributeValueExp(::javax::management::Query$ClassAttributeValueExp *);
-private:
-  static const jlong serialVersionUID = -1081892073854801359LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$ClassAttributeValueExp__
diff --git a/libjava/javax/management/Query$InQueryExp.h b/libjava/javax/management/Query$InQueryExp.h
deleted file mode 100644
index 5bdb3b8a927..00000000000
--- a/libjava/javax/management/Query$InQueryExp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$InQueryExp__
-#define __javax_management_Query$InQueryExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$InQueryExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query$InQueryExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$InQueryExp(::javax::management::ValueExp *, JArray< ::javax::management::ValueExp * > *);
-  jboolean apply(::javax::management::ObjectName *);
-private:
-  static const jlong serialVersionUID = -5801329450358952434LL;
-  ::javax::management::ValueExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) val;
-  JArray< ::javax::management::ValueExp * > * valueList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$InQueryExp__
diff --git a/libjava/javax/management/Query$InstanceOfQueryExp.h b/libjava/javax/management/Query$InstanceOfQueryExp.h
deleted file mode 100644
index 3d2828c540c..00000000000
--- a/libjava/javax/management/Query$InstanceOfQueryExp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$InstanceOfQueryExp__
-#define __javax_management_Query$InstanceOfQueryExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$InstanceOfQueryExp;
-        class StringValueExp;
-    }
-  }
-}
-
-class javax::management::Query$InstanceOfQueryExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$InstanceOfQueryExp(::javax::management::StringValueExp *);
-  jboolean apply(::javax::management::ObjectName *);
-private:
-  static const jlong serialVersionUID = -1081892073854801359LL;
-  ::javax::management::StringValueExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) classNameValue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$InstanceOfQueryExp__
diff --git a/libjava/javax/management/Query$MatchQueryExp.h b/libjava/javax/management/Query$MatchQueryExp.h
deleted file mode 100644
index 77da4ea6d78..00000000000
--- a/libjava/javax/management/Query$MatchQueryExp.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$MatchQueryExp__
-#define __javax_management_Query$MatchQueryExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class AttributeValueExp;
-        class ObjectName;
-        class Query$MatchQueryExp;
-    }
-  }
-}
-
-class javax::management::Query$MatchQueryExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$MatchQueryExp(::javax::management::AttributeValueExp *, ::java::lang::String *);
-  jboolean apply(::javax::management::ObjectName *);
-private:
-  static const jlong serialVersionUID = -7156603696948215014LL;
-  ::javax::management::AttributeValueExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp;
-  ::java::lang::String * pattern;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$MatchQueryExp__
diff --git a/libjava/javax/management/Query$NotQueryExp.h b/libjava/javax/management/Query$NotQueryExp.h
deleted file mode 100644
index b5d5a166752..00000000000
--- a/libjava/javax/management/Query$NotQueryExp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$NotQueryExp__
-#define __javax_management_Query$NotQueryExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$NotQueryExp;
-        class QueryExp;
-    }
-  }
-}
-
-class javax::management::Query$NotQueryExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$NotQueryExp(::javax::management::QueryExp *);
-  jboolean apply(::javax::management::ObjectName *);
-private:
-  static const jlong serialVersionUID = 5269643775896723397LL;
-  ::javax::management::QueryExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$NotQueryExp__
diff --git a/libjava/javax/management/Query$NumericValueExp.h b/libjava/javax/management/Query$NumericValueExp.h
deleted file mode 100644
index 8e545670cfc..00000000000
--- a/libjava/javax/management/Query$NumericValueExp.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$NumericValueExp__
-#define __javax_management_Query$NumericValueExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$NumericValueExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query$NumericValueExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$NumericValueExp(::java::lang::Number *);
-  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
-  ::java::lang::Number * getValue();
-  ::java::lang::String * toString();
-  ::javax::management::Query$NumericValueExp * plus(::javax::management::Query$NumericValueExp *);
-  ::javax::management::Query$NumericValueExp * minus(::javax::management::Query$NumericValueExp *);
-  ::javax::management::Query$NumericValueExp * times(::javax::management::Query$NumericValueExp *);
-  ::javax::management::Query$NumericValueExp * div(::javax::management::Query$NumericValueExp *);
-private:
-  static const jlong serialVersionUID = -4679739485102359104LL;
-  ::java::lang::Number * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$NumericValueExp__
diff --git a/libjava/javax/management/Query$OrQueryExp.h b/libjava/javax/management/Query$OrQueryExp.h
deleted file mode 100644
index cde1c65dcbf..00000000000
--- a/libjava/javax/management/Query$OrQueryExp.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$OrQueryExp__
-#define __javax_management_Query$OrQueryExp__
-
-#pragma interface
-
-#include <javax/management/QueryEval.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$OrQueryExp;
-        class QueryExp;
-    }
-  }
-}
-
-class javax::management::Query$OrQueryExp : public ::javax::management::QueryEval
-{
-
-public:
-  Query$OrQueryExp(::javax::management::QueryExp *, ::javax::management::QueryExp *);
-  jboolean apply(::javax::management::ObjectName *);
-private:
-  static const jlong serialVersionUID = 2962973084421716523LL;
-  ::javax::management::QueryExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp1;
-  ::javax::management::QueryExp * exp2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$OrQueryExp__
diff --git a/libjava/javax/management/Query$QualifiedAttributeValueExp.h b/libjava/javax/management/Query$QualifiedAttributeValueExp.h
deleted file mode 100644
index 01045b6a68b..00000000000
--- a/libjava/javax/management/Query$QualifiedAttributeValueExp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query$QualifiedAttributeValueExp__
-#define __javax_management_Query$QualifiedAttributeValueExp__
-
-#pragma interface
-
-#include <javax/management/AttributeValueExp.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectName;
-        class Query$QualifiedAttributeValueExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query$QualifiedAttributeValueExp : public ::javax::management::AttributeValueExp
-{
-
-public:
-  Query$QualifiedAttributeValueExp(::java::lang::String *, ::java::lang::String *);
-  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
-private:
-  static const jlong serialVersionUID = 8832517277410933254LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::AttributeValueExp)))) className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query$QualifiedAttributeValueExp__
diff --git a/libjava/javax/management/Query.h b/libjava/javax/management/Query.h
deleted file mode 100644
index 34e28e754f9..00000000000
--- a/libjava/javax/management/Query.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Query__
-#define __javax_management_Query__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class AttributeValueExp;
-        class Query;
-        class QueryExp;
-        class StringValueExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::Query : public ::java::lang::Object
-{
-
-public:
-  Query();
-  static ::javax::management::QueryExp * and$(::javax::management::QueryExp *, ::javax::management::QueryExp *);
-  static ::javax::management::QueryExp * anySubString(::javax::management::AttributeValueExp *, ::javax::management::StringValueExp *);
-  static ::javax::management::AttributeValueExp * attr(::java::lang::String *);
-  static ::javax::management::AttributeValueExp * attr(::java::lang::String *, ::java::lang::String *);
-  static ::javax::management::QueryExp * between(::javax::management::ValueExp *, ::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::AttributeValueExp * classattr();
-  static ::javax::management::ValueExp * div(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::QueryExp * eq(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::QueryExp * finalSubString(::javax::management::AttributeValueExp *, ::javax::management::StringValueExp *);
-  static ::javax::management::QueryExp * geq(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::QueryExp * gt(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::QueryExp * in(::javax::management::ValueExp *, JArray< ::javax::management::ValueExp * > *);
-  static ::javax::management::QueryExp * initialSubString(::javax::management::AttributeValueExp *, ::javax::management::StringValueExp *);
-  static ::javax::management::QueryExp * isInstanceOf(::javax::management::StringValueExp *);
-  static ::javax::management::QueryExp * leq(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::QueryExp * lt(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::QueryExp * match(::javax::management::AttributeValueExp *, ::javax::management::StringValueExp *);
-  static ::javax::management::ValueExp * minus(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::QueryExp * not$(::javax::management::QueryExp *);
-  static ::javax::management::QueryExp * or$(::javax::management::QueryExp *, ::javax::management::QueryExp *);
-  static ::javax::management::ValueExp * plus(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::ValueExp * times(::javax::management::ValueExp *, ::javax::management::ValueExp *);
-  static ::javax::management::ValueExp * value(jboolean);
-  static ::javax::management::ValueExp * value(jdouble);
-  static ::javax::management::ValueExp * value(jfloat);
-  static ::javax::management::ValueExp * value(jint);
-  static ::javax::management::ValueExp * value(jlong);
-  static ::javax::management::ValueExp * value(::java::lang::Number *);
-  static ::javax::management::StringValueExp * value(::java::lang::String *);
-  static const jint PLUS = 0;
-  static const jint MINUS = 1;
-  static const jint TIMES = 2;
-  static const jint DIV = 3;
-  static const jint GT = 0;
-  static const jint LT = 1;
-  static const jint GE = 2;
-  static const jint LE = 3;
-  static const jint EQ = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Query__
diff --git a/libjava/javax/management/QueryEval.h b/libjava/javax/management/QueryEval.h
deleted file mode 100644
index adba7bb9845..00000000000
--- a/libjava/javax/management/QueryEval.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_QueryEval__
-#define __javax_management_QueryEval__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class QueryEval;
-    }
-  }
-}
-
-class javax::management::QueryEval : public ::java::lang::Object
-{
-
-public:
-  QueryEval();
-  static ::javax::management::MBeanServer * getMBeanServer();
-  virtual void setMBeanServer(::javax::management::MBeanServer *);
-private:
-  static const jlong serialVersionUID = 2675899265640874796LL;
-  static ::java::lang::InheritableThreadLocal * server;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_QueryEval__
diff --git a/libjava/javax/management/QueryExp.h b/libjava/javax/management/QueryExp.h
deleted file mode 100644
index 7790c378311..00000000000
--- a/libjava/javax/management/QueryExp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_QueryExp__
-#define __javax_management_QueryExp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class ObjectName;
-        class QueryExp;
-    }
-  }
-}
-
-class javax::management::QueryExp : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean apply(::javax::management::ObjectName *) = 0;
-  virtual void setMBeanServer(::javax::management::MBeanServer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_QueryExp__
diff --git a/libjava/javax/management/ReflectionException.h b/libjava/javax/management/ReflectionException.h
deleted file mode 100644
index d8b08802cb4..00000000000
--- a/libjava/javax/management/ReflectionException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ReflectionException__
-#define __javax_management_ReflectionException__
-
-#pragma interface
-
-#include <javax/management/JMException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ReflectionException;
-    }
-  }
-}
-
-class javax::management::ReflectionException : public ::javax::management::JMException
-{
-
-public:
-  ReflectionException(::java::lang::Exception *);
-  ReflectionException(::java::lang::Exception *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Exception * getTargetException();
-private:
-  static const jlong serialVersionUID = 9170809325636915553LL;
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::javax::management::JMException)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ReflectionException__
diff --git a/libjava/javax/management/RuntimeErrorException.h b/libjava/javax/management/RuntimeErrorException.h
deleted file mode 100644
index fdf440a1f5a..00000000000
--- a/libjava/javax/management/RuntimeErrorException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_RuntimeErrorException__
-#define __javax_management_RuntimeErrorException__
-
-#pragma interface
-
-#include <javax/management/JMRuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class RuntimeErrorException;
-    }
-  }
-}
-
-class javax::management::RuntimeErrorException : public ::javax::management::JMRuntimeException
-{
-
-public:
-  RuntimeErrorException(::java::lang::Error *);
-  RuntimeErrorException(::java::lang::Error *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Error * getTargetError();
-private:
-  static const jlong serialVersionUID = 704338937753949796LL;
-  ::java::lang::Error * __attribute__((aligned(__alignof__( ::javax::management::JMRuntimeException)))) error;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_RuntimeErrorException__
diff --git a/libjava/javax/management/RuntimeMBeanException.h b/libjava/javax/management/RuntimeMBeanException.h
deleted file mode 100644
index 599cb916e56..00000000000
--- a/libjava/javax/management/RuntimeMBeanException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_RuntimeMBeanException__
-#define __javax_management_RuntimeMBeanException__
-
-#pragma interface
-
-#include <javax/management/JMRuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class RuntimeMBeanException;
-    }
-  }
-}
-
-class javax::management::RuntimeMBeanException : public ::javax::management::JMRuntimeException
-{
-
-public:
-  RuntimeMBeanException(::java::lang::RuntimeException *);
-  RuntimeMBeanException(::java::lang::RuntimeException *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::RuntimeException * getTargetException();
-private:
-  static const jlong serialVersionUID = 5274912751982730171LL;
-  ::java::lang::RuntimeException * __attribute__((aligned(__alignof__( ::javax::management::JMRuntimeException)))) runtimeException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_RuntimeMBeanException__
diff --git a/libjava/javax/management/RuntimeOperationsException.h b/libjava/javax/management/RuntimeOperationsException.h
deleted file mode 100644
index 3a8a1e71761..00000000000
--- a/libjava/javax/management/RuntimeOperationsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_RuntimeOperationsException__
-#define __javax_management_RuntimeOperationsException__
-
-#pragma interface
-
-#include <javax/management/JMRuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class RuntimeOperationsException;
-    }
-  }
-}
-
-class javax::management::RuntimeOperationsException : public ::javax::management::JMRuntimeException
-{
-
-public:
-  RuntimeOperationsException(::java::lang::RuntimeException *);
-  RuntimeOperationsException(::java::lang::RuntimeException *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::RuntimeException * getTargetException();
-private:
-  static const jlong serialVersionUID = -8408923047489133588LL;
-  ::java::lang::RuntimeException * __attribute__((aligned(__alignof__( ::javax::management::JMRuntimeException)))) runtimeException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_RuntimeOperationsException__
diff --git a/libjava/javax/management/ServiceNotFoundException.h b/libjava/javax/management/ServiceNotFoundException.h
deleted file mode 100644
index 8eb29020899..00000000000
--- a/libjava/javax/management/ServiceNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ServiceNotFoundException__
-#define __javax_management_ServiceNotFoundException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ServiceNotFoundException;
-    }
-  }
-}
-
-class javax::management::ServiceNotFoundException : public ::javax::management::OperationsException
-{
-
-public:
-  ServiceNotFoundException();
-  ServiceNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3990675661956646827LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ServiceNotFoundException__
diff --git a/libjava/javax/management/StandardMBean.h b/libjava/javax/management/StandardMBean.h
deleted file mode 100644
index 805046ada6c..00000000000
--- a/libjava/javax/management/StandardMBean.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_StandardMBean__
-#define __javax_management_StandardMBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class MBeanAttributeInfo;
-        class MBeanConstructorInfo;
-        class MBeanFeatureInfo;
-        class MBeanInfo;
-        class MBeanOperationInfo;
-        class MBeanParameterInfo;
-        class StandardMBean;
-    }
-  }
-}
-
-class javax::management::StandardMBean : public ::java::lang::Object
-{
-
-public: // actually protected
-  StandardMBean(::java::lang::Class *);
-public:
-  StandardMBean(::java::lang::Object *, ::java::lang::Class *);
-public: // actually protected
-  virtual void cacheMBeanInfo(::javax::management::MBeanInfo *);
-public:
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *);
-  virtual ::javax::management::AttributeList * getAttributes(JArray< ::java::lang::String * > *);
-public: // actually protected
-  virtual ::javax::management::MBeanInfo * getCachedMBeanInfo();
-  virtual ::java::lang::String * getClassName(::javax::management::MBeanInfo *);
-  virtual JArray< ::javax::management::MBeanConstructorInfo * > * getConstructors(JArray< ::javax::management::MBeanConstructorInfo * > *, ::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanAttributeInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanConstructorInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanConstructorInfo *, ::javax::management::MBeanParameterInfo *, jint);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanFeatureInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanOperationInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanOperationInfo *, ::javax::management::MBeanParameterInfo *, jint);
-  virtual jint getImpact(::javax::management::MBeanOperationInfo *);
-public:
-  virtual ::java::lang::Object * getImplementation();
-  virtual ::java::lang::Class * getImplementationClass();
-  virtual ::javax::management::MBeanInfo * getMBeanInfo();
-  virtual ::java::lang::Class * getMBeanInterface();
-public: // actually protected
-  virtual ::java::lang::String * getParameterName(::javax::management::MBeanConstructorInfo *, ::javax::management::MBeanParameterInfo *, jint);
-  virtual ::java::lang::String * getParameterName(::javax::management::MBeanOperationInfo *, ::javax::management::MBeanParameterInfo *, jint);
-public:
-  virtual ::java::lang::Object * invoke(::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *);
-  virtual void setAttribute(::javax::management::Attribute *);
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::AttributeList *);
-  virtual void setImplementation(::java::lang::Object *);
-private:
-  ::java::lang::reflect::Method * getMutator(::java::lang::String *, ::java::lang::Class *);
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iface;
-  ::java::lang::Object * impl;
-  ::javax::management::MBeanInfo * info;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_StandardMBean__
diff --git a/libjava/javax/management/StringValueExp.h b/libjava/javax/management/StringValueExp.h
deleted file mode 100644
index b8cded4e5c1..00000000000
--- a/libjava/javax/management/StringValueExp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_StringValueExp__
-#define __javax_management_StringValueExp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class ObjectName;
-        class StringValueExp;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::StringValueExp : public ::java::lang::Object
-{
-
-public:
-  StringValueExp();
-  StringValueExp(::java::lang::String *);
-  virtual ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
-  virtual ::java::lang::String * getValue();
-  virtual void setMBeanServer(::javax::management::MBeanServer *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3256390509806284044LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_StringValueExp__
diff --git a/libjava/javax/management/ValueExp.h b/libjava/javax/management/ValueExp.h
deleted file mode 100644
index 4837d9f62c1..00000000000
--- a/libjava/javax/management/ValueExp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ValueExp__
-#define __javax_management_ValueExp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class ObjectName;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::ValueExp : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::management::ValueExp * apply(::javax::management::ObjectName *) = 0;
-  virtual void setMBeanServer(::javax::management::MBeanServer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_ValueExp__
diff --git a/libjava/javax/management/loading/ClassLoaderRepository.h b/libjava/javax/management/loading/ClassLoaderRepository.h
deleted file mode 100644
index 0332c059c7d..00000000000
--- a/libjava/javax/management/loading/ClassLoaderRepository.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_loading_ClassLoaderRepository__
-#define __javax_management_loading_ClassLoaderRepository__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace loading
-      {
-          class ClassLoaderRepository;
-      }
-    }
-  }
-}
-
-class javax::management::loading::ClassLoaderRepository : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * loadClass(::java::lang::String *) = 0;
-  virtual ::java::lang::Class * loadClassBefore(::java::lang::ClassLoader *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Class * loadClassWithout(::java::lang::ClassLoader *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_loading_ClassLoaderRepository__
diff --git a/libjava/javax/management/openmbean/ArrayType.h b/libjava/javax/management/openmbean/ArrayType.h
deleted file mode 100644
index e559cf22a9c..00000000000
--- a/libjava/javax/management/openmbean/ArrayType.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_ArrayType__
-#define __javax_management_openmbean_ArrayType__
-
-#pragma interface
-
-#include <javax/management/openmbean/OpenType.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class ArrayType;
-          class OpenType;
-          class SimpleType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::ArrayType : public ::javax::management::openmbean::OpenType
-{
-
-  static ::java::lang::String * getArrayClassName(::javax::management::openmbean::OpenType *, jint, jboolean);
-  static jint getDimensions(::javax::management::openmbean::OpenType *, jint);
-  static ::javax::management::openmbean::SimpleType * getPrimitiveType(::java::lang::Class *);
-  static ::java::lang::Class * getPrimitiveTypeClass(::javax::management::openmbean::SimpleType *);
-  static ::javax::management::openmbean::OpenType * getElementType(::javax::management::openmbean::OpenType *);
-  static ::java::lang::String * getElementTypeName(::javax::management::openmbean::OpenType *);
-public:
-  ArrayType(jint, ::javax::management::openmbean::OpenType *);
-  ArrayType(::javax::management::openmbean::SimpleType *, jboolean);
-  virtual jboolean equals(::java::lang::Object *);
-  static ::javax::management::openmbean::ArrayType * getArrayType(::javax::management::openmbean::OpenType *);
-  static ::javax::management::openmbean::ArrayType * getPrimitiveArrayType(::java::lang::Class *);
-  virtual jint getDimension();
-  virtual ::javax::management::openmbean::OpenType * getElementOpenType();
-  virtual jint hashCode();
-  virtual jboolean isPrimitiveArray();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 720504429830309770LL;
-  jint __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) dimension;
-  ::javax::management::openmbean::OpenType * elementType;
-  jboolean primitiveArray;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-  static ::java::util::Map * cache;
-  static ::java::util::Map * primCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_ArrayType__
diff --git a/libjava/javax/management/openmbean/CompositeData.h b/libjava/javax/management/openmbean/CompositeData.h
deleted file mode 100644
index 7382cdf927c..00000000000
--- a/libjava/javax/management/openmbean/CompositeData.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_CompositeData__
-#define __javax_management_openmbean_CompositeData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-          class CompositeType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::CompositeData : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean containsKey(::java::lang::String *) = 0;
-  virtual jboolean containsValue(::java::lang::Object *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * get(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::Object * > * getAll(JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::management::openmbean::CompositeType * getCompositeType() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_CompositeData__
diff --git a/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h b/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h
deleted file mode 100644
index e10d3645f26..00000000000
--- a/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_CompositeDataInvocationHandler__
-#define __javax_management_openmbean_CompositeDataInvocationHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-          class CompositeDataInvocationHandler;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::CompositeDataInvocationHandler : public ::java::lang::Object
-{
-
-public:
-  CompositeDataInvocationHandler(::javax::management::openmbean::CompositeData *);
-  virtual ::javax::management::openmbean::CompositeData * getCompositeData();
-  virtual ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
-private:
-  ::javax::management::openmbean::CompositeData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_CompositeDataInvocationHandler__
diff --git a/libjava/javax/management/openmbean/CompositeDataSupport.h b/libjava/javax/management/openmbean/CompositeDataSupport.h
deleted file mode 100644
index fcf0b73a96b..00000000000
--- a/libjava/javax/management/openmbean/CompositeDataSupport.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_CompositeDataSupport__
-#define __javax_management_openmbean_CompositeDataSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeDataSupport;
-          class CompositeType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::CompositeDataSupport : public ::java::lang::Object
-{
-
-public:
-  CompositeDataSupport(::javax::management::openmbean::CompositeType *, ::java::util::Map *);
-  CompositeDataSupport(::javax::management::openmbean::CompositeType *, JArray< ::java::lang::String * > *, JArray< ::java::lang::Object * > *);
-  virtual jboolean containsKey(::java::lang::String *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::String *);
-  virtual JArray< ::java::lang::Object * > * getAll(JArray< ::java::lang::String * > *);
-  virtual ::javax::management::openmbean::CompositeType * getCompositeType();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Collection * values();
-private:
-  static const jlong serialVersionUID = 8003518976613702244LL;
-  ::java::util::SortedMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) contents;
-  ::javax::management::openmbean::CompositeType * compositeType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_CompositeDataSupport__
diff --git a/libjava/javax/management/openmbean/CompositeType.h b/libjava/javax/management/openmbean/CompositeType.h
deleted file mode 100644
index 30dcad38fda..00000000000
--- a/libjava/javax/management/openmbean/CompositeType.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_CompositeType__
-#define __javax_management_openmbean_CompositeType__
-
-#pragma interface
-
-#include <javax/management/openmbean/OpenType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeType;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::CompositeType : public ::javax::management::openmbean::OpenType
-{
-
-public:
-  CompositeType(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::javax::management::openmbean::OpenType * > *);
-  virtual jboolean containsKey(::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::java::lang::String *);
-  virtual ::javax::management::openmbean::OpenType * getType(::java::lang::String *);
-  virtual jint hashCode();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::util::Set * keySet();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5366242454346948798LL;
-  ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) nameToDescription;
-  ::java::util::TreeMap * nameToType;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_CompositeType__
diff --git a/libjava/javax/management/openmbean/InvalidKeyException.h b/libjava/javax/management/openmbean/InvalidKeyException.h
deleted file mode 100644
index 8534b941fde..00000000000
--- a/libjava/javax/management/openmbean/InvalidKeyException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_InvalidKeyException__
-#define __javax_management_openmbean_InvalidKeyException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class InvalidKeyException;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::InvalidKeyException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  InvalidKeyException();
-  InvalidKeyException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4224269443946322062LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_InvalidKeyException__
diff --git a/libjava/javax/management/openmbean/InvalidOpenTypeException.h b/libjava/javax/management/openmbean/InvalidOpenTypeException.h
deleted file mode 100644
index 8dec6485981..00000000000
--- a/libjava/javax/management/openmbean/InvalidOpenTypeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_InvalidOpenTypeException__
-#define __javax_management_openmbean_InvalidOpenTypeException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class InvalidOpenTypeException;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::InvalidOpenTypeException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  InvalidOpenTypeException();
-  InvalidOpenTypeException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2837312755412327534LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_InvalidOpenTypeException__
diff --git a/libjava/javax/management/openmbean/KeyAlreadyExistsException.h b/libjava/javax/management/openmbean/KeyAlreadyExistsException.h
deleted file mode 100644
index 40269dd03f0..00000000000
--- a/libjava/javax/management/openmbean/KeyAlreadyExistsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_KeyAlreadyExistsException__
-#define __javax_management_openmbean_KeyAlreadyExistsException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class KeyAlreadyExistsException;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::KeyAlreadyExistsException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  KeyAlreadyExistsException();
-  KeyAlreadyExistsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1845183636745282866LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_KeyAlreadyExistsException__
diff --git a/libjava/javax/management/openmbean/OpenDataException.h b/libjava/javax/management/openmbean/OpenDataException.h
deleted file mode 100644
index d79caa5eb8a..00000000000
--- a/libjava/javax/management/openmbean/OpenDataException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenDataException__
-#define __javax_management_openmbean_OpenDataException__
-
-#pragma interface
-
-#include <javax/management/JMException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenDataException;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenDataException : public ::javax::management::JMException
-{
-
-public:
-  OpenDataException();
-  OpenDataException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8346311255433349870LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenDataException__
diff --git a/libjava/javax/management/openmbean/OpenMBeanAttributeInfo.h b/libjava/javax/management/openmbean/OpenMBeanAttributeInfo.h
deleted file mode 100644
index 2e576dcd931..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanAttributeInfo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanAttributeInfo__
-#define __javax_management_openmbean_OpenMBeanAttributeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanAttributeInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanAttributeInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isIs() = 0;
-  virtual jboolean isReadable() = 0;
-  virtual jboolean isWritable() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::lang::Object * getDefaultValue() = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual ::java::util::Set * getLegalValues() = 0;
-  virtual ::java::lang::Comparable * getMaxValue() = 0;
-  virtual ::java::lang::Comparable * getMinValue() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::management::openmbean::OpenType * getOpenType() = 0;
-  virtual jboolean hasDefaultValue() = 0;
-  virtual jboolean hasLegalValues() = 0;
-  virtual jboolean hasMaxValue() = 0;
-  virtual jboolean hasMinValue() = 0;
-  virtual jboolean isValue(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanAttributeInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanAttributeInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanAttributeInfoSupport.h
deleted file mode 100644
index a9cdbcfcf06..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanAttributeInfoSupport.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanAttributeInfoSupport__
-#define __javax_management_openmbean_OpenMBeanAttributeInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanAttributeInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanAttributeInfoSupport;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanAttributeInfoSupport : public ::javax::management::MBeanAttributeInfo
-{
-
-public:
-  OpenMBeanAttributeInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, jboolean, jboolean, jboolean);
-  OpenMBeanAttributeInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, jboolean, jboolean, jboolean, ::java::lang::Object *);
-  OpenMBeanAttributeInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, jboolean, jboolean, jboolean, ::java::lang::Object *, ::java::lang::Comparable *, ::java::lang::Comparable *);
-  OpenMBeanAttributeInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, jboolean, jboolean, jboolean, ::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getDefaultValue();
-  virtual ::java::util::Set * getLegalValues();
-  virtual ::java::lang::Comparable * getMaxValue();
-  virtual ::java::lang::Comparable * getMinValue();
-  virtual ::javax::management::openmbean::OpenType * getOpenType();
-  virtual jboolean hasDefaultValue();
-  virtual jint hashCode();
-  virtual jboolean hasLegalValues();
-  virtual jboolean hasMaxValue();
-  virtual jboolean hasMinValue();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -4867215622149721849LL;
-  ::javax::management::openmbean::OpenType * __attribute__((aligned(__alignof__( ::javax::management::MBeanAttributeInfo)))) openType;
-  ::java::lang::Object * defaultValue;
-  ::java::util::Set * legalValues;
-  ::java::lang::Comparable * minValue;
-  ::java::lang::Comparable * maxValue;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanAttributeInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenMBeanConstructorInfo.h b/libjava/javax/management/openmbean/OpenMBeanConstructorInfo.h
deleted file mode 100644
index 07adf096c01..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanConstructorInfo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanConstructorInfo__
-#define __javax_management_openmbean_OpenMBeanConstructorInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanParameterInfo;
-      namespace openmbean
-      {
-          class OpenMBeanConstructorInfo;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanConstructorInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual JArray< ::javax::management::MBeanParameterInfo * > * getSignature() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanConstructorInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanConstructorInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanConstructorInfoSupport.h
deleted file mode 100644
index a64d9cdda57..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanConstructorInfoSupport.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanConstructorInfoSupport__
-#define __javax_management_openmbean_OpenMBeanConstructorInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanConstructorInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanConstructorInfoSupport;
-          class OpenMBeanParameterInfo;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanConstructorInfoSupport : public ::javax::management::MBeanConstructorInfo
-{
-
-public:
-  OpenMBeanConstructorInfoSupport(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::openmbean::OpenMBeanParameterInfo * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -4400441579007477003LL;
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::javax::management::MBeanConstructorInfo)))) hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanConstructorInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenMBeanInfo.h b/libjava/javax/management/openmbean/OpenMBeanInfo.h
deleted file mode 100644
index 2d61d82326e..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanInfo.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanInfo__
-#define __javax_management_openmbean_OpenMBeanInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanAttributeInfo;
-        class MBeanConstructorInfo;
-        class MBeanNotificationInfo;
-        class MBeanOperationInfo;
-      namespace openmbean
-      {
-          class OpenMBeanInfo;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual JArray< ::javax::management::MBeanAttributeInfo * > * getAttributes() = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual JArray< ::javax::management::MBeanConstructorInfo * > * getConstructors() = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotifications() = 0;
-  virtual JArray< ::javax::management::MBeanOperationInfo * > * getOperations() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanInfoSupport.h
deleted file mode 100644
index 4b4e500311d..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanInfoSupport.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanInfoSupport__
-#define __javax_management_openmbean_OpenMBeanInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-      namespace openmbean
-      {
-          class OpenMBeanAttributeInfo;
-          class OpenMBeanConstructorInfo;
-          class OpenMBeanInfoSupport;
-          class OpenMBeanOperationInfo;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanInfoSupport : public ::javax::management::MBeanInfo
-{
-
-public:
-  OpenMBeanInfoSupport(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::openmbean::OpenMBeanAttributeInfo * > *, JArray< ::javax::management::openmbean::OpenMBeanConstructorInfo * > *, JArray< ::javax::management::openmbean::OpenMBeanOperationInfo * > *, JArray< ::javax::management::MBeanNotificationInfo * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4349395935420511492LL;
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::javax::management::MBeanInfo)))) hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenMBeanOperationInfo.h b/libjava/javax/management/openmbean/OpenMBeanOperationInfo.h
deleted file mode 100644
index 4cdf93114d3..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanOperationInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanOperationInfo__
-#define __javax_management_openmbean_OpenMBeanOperationInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanParameterInfo;
-      namespace openmbean
-      {
-          class OpenMBeanOperationInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanOperationInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual jint getImpact() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::management::openmbean::OpenType * getReturnOpenType() = 0;
-  virtual ::java::lang::String * getReturnType() = 0;
-  virtual JArray< ::javax::management::MBeanParameterInfo * > * getSignature() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanOperationInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanOperationInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanOperationInfoSupport.h
deleted file mode 100644
index 04071e35afd..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanOperationInfoSupport.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanOperationInfoSupport__
-#define __javax_management_openmbean_OpenMBeanOperationInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanOperationInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanOperationInfoSupport;
-          class OpenMBeanParameterInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanOperationInfoSupport : public ::javax::management::MBeanOperationInfo
-{
-
-public:
-  OpenMBeanOperationInfoSupport(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::openmbean::OpenMBeanParameterInfo * > *, ::javax::management::openmbean::OpenType *, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::management::openmbean::OpenType * getReturnOpenType();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4996859732565369366LL;
-  ::javax::management::openmbean::OpenType * __attribute__((aligned(__alignof__( ::javax::management::MBeanOperationInfo)))) returnOpenType;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanOperationInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenMBeanParameterInfo.h b/libjava/javax/management/openmbean/OpenMBeanParameterInfo.h
deleted file mode 100644
index 5fe63058d4f..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanParameterInfo.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanParameterInfo__
-#define __javax_management_openmbean_OpenMBeanParameterInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanParameterInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanParameterInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getDefaultValue() = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual ::java::util::Set * getLegalValues() = 0;
-  virtual ::java::lang::Comparable * getMaxValue() = 0;
-  virtual ::java::lang::Comparable * getMinValue() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::management::openmbean::OpenType * getOpenType() = 0;
-  virtual jboolean hasDefaultValue() = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean hasLegalValues() = 0;
-  virtual jboolean hasMaxValue() = 0;
-  virtual jboolean hasMinValue() = 0;
-  virtual jboolean isValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanParameterInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanParameterInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanParameterInfoSupport.h
deleted file mode 100644
index 41f8bb4517e..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanParameterInfoSupport.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanParameterInfoSupport__
-#define __javax_management_openmbean_OpenMBeanParameterInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanParameterInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanParameterInfoSupport;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanParameterInfoSupport : public ::javax::management::MBeanParameterInfo
-{
-
-public:
-  OpenMBeanParameterInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *);
-  OpenMBeanParameterInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, ::java::lang::Object *);
-  OpenMBeanParameterInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, ::java::lang::Object *, ::java::lang::Comparable *, ::java::lang::Comparable *);
-  OpenMBeanParameterInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, ::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getDefaultValue();
-  virtual ::java::util::Set * getLegalValues();
-  virtual ::java::lang::Comparable * getMaxValue();
-  virtual ::java::lang::Comparable * getMinValue();
-  virtual ::javax::management::openmbean::OpenType * getOpenType();
-  virtual jboolean hasDefaultValue();
-  virtual jint hashCode();
-  virtual jboolean hasLegalValues();
-  virtual jboolean hasMaxValue();
-  virtual jboolean hasMinValue();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -7235016873758443122LL;
-  ::javax::management::openmbean::OpenType * __attribute__((aligned(__alignof__( ::javax::management::MBeanParameterInfo)))) openType;
-  ::java::lang::Object * defaultValue;
-  ::java::util::Set * legalValues;
-  ::java::lang::Comparable * minValue;
-  ::java::lang::Comparable * maxValue;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanParameterInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenType.h b/libjava/javax/management/openmbean/OpenType.h
deleted file mode 100644
index b442b64ba11..00000000000
--- a/libjava/javax/management/openmbean/OpenType.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenType__
-#define __javax_management_openmbean_OpenType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenType : public ::java::lang::Object
-{
-
-public: // actually protected
-  OpenType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getTypeName();
-  virtual jint hashCode() = 0;
-  virtual jboolean isArray();
-  virtual jboolean isValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-private:
-  static const jlong serialVersionUID = -9195195325186646468LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) className;
-  ::java::lang::String * typeName;
-  ::java::lang::String * description;
-public:
-  static JArray< ::java::lang::String * > * ALLOWED_CLASSNAMES;
-  static ::java::util::List * ALLOWED_CLASSNAMES_LIST;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenType__
diff --git a/libjava/javax/management/openmbean/SimpleType.h b/libjava/javax/management/openmbean/SimpleType.h
deleted file mode 100644
index 1ff75672cc7..00000000000
--- a/libjava/javax/management/openmbean/SimpleType.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_SimpleType__
-#define __javax_management_openmbean_SimpleType__
-
-#pragma interface
-
-#include <javax/management/openmbean/OpenType.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class SimpleType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::SimpleType : public ::javax::management::openmbean::OpenType
-{
-
-  SimpleType(::java::lang::String *);
-public:
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  jboolean isValue(::java::lang::Object *);
-  ::java::lang::Object * readResolve();
-  ::java::lang::String * toString();
-  static ::javax::management::openmbean::SimpleType * BIGDECIMAL;
-  static ::javax::management::openmbean::SimpleType * BIGINTEGER;
-  static ::javax::management::openmbean::SimpleType * BOOLEAN;
-  static ::javax::management::openmbean::SimpleType * BYTE;
-  static ::javax::management::openmbean::SimpleType * CHARACTER;
-  static ::javax::management::openmbean::SimpleType * DATE;
-  static ::javax::management::openmbean::SimpleType * DOUBLE;
-  static ::javax::management::openmbean::SimpleType * FLOAT;
-  static ::javax::management::openmbean::SimpleType * INTEGER;
-  static ::javax::management::openmbean::SimpleType * LONG;
-  static ::javax::management::openmbean::SimpleType * OBJECTNAME;
-  static ::javax::management::openmbean::SimpleType * SHORT;
-  static ::javax::management::openmbean::SimpleType * STRING;
-  static ::javax::management::openmbean::SimpleType * VOID;
-private:
-  static const jlong serialVersionUID = 2215577471957694503LL;
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_SimpleType__
diff --git a/libjava/javax/management/openmbean/TabularData.h b/libjava/javax/management/openmbean/TabularData.h
deleted file mode 100644
index ef70028a983..00000000000
--- a/libjava/javax/management/openmbean/TabularData.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_TabularData__
-#define __javax_management_openmbean_TabularData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-          class TabularData;
-          class TabularType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::TabularData : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Object * > * calculateIndex(::javax::management::openmbean::CompositeData *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(JArray< ::java::lang::Object * > *) = 0;
-  virtual jboolean containsValue(::javax::management::openmbean::CompositeData *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::javax::management::openmbean::CompositeData * get(JArray< ::java::lang::Object * > *) = 0;
-  virtual ::javax::management::openmbean::TabularType * getTabularType() = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Set * keySet() = 0;
-  virtual void put(::javax::management::openmbean::CompositeData *) = 0;
-  virtual void putAll(JArray< ::javax::management::openmbean::CompositeData * > *) = 0;
-  virtual ::javax::management::openmbean::CompositeData * remove(JArray< ::java::lang::Object * > *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_TabularData__
diff --git a/libjava/javax/management/openmbean/TabularDataSupport.h b/libjava/javax/management/openmbean/TabularDataSupport.h
deleted file mode 100644
index cce9dbe8ae3..00000000000
--- a/libjava/javax/management/openmbean/TabularDataSupport.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_TabularDataSupport__
-#define __javax_management_openmbean_TabularDataSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-          class TabularDataSupport;
-          class TabularType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::TabularDataSupport : public ::java::lang::Object
-{
-
-public:
-  TabularDataSupport(::javax::management::openmbean::TabularType *);
-  TabularDataSupport(::javax::management::openmbean::TabularType *, jint, jfloat);
-  virtual JArray< ::java::lang::Object * > * calculateIndex(::javax::management::openmbean::CompositeData *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsKey(JArray< ::java::lang::Object * > *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual jboolean containsValue(::javax::management::openmbean::CompositeData *);
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::javax::management::openmbean::CompositeData * get(JArray< ::java::lang::Object * > *);
-  virtual ::javax::management::openmbean::TabularType * getTabularType();
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-private:
-  jboolean isKeyValid(JArray< ::java::lang::Object * > *);
-public:
-  virtual ::java::util::Set * keySet();
-  virtual void put(::javax::management::openmbean::CompositeData *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(JArray< ::javax::management::openmbean::CompositeData * > *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual ::javax::management::openmbean::CompositeData * remove(JArray< ::java::lang::Object * > *);
-private:
-  void setMap(::java::util::HashMap *);
-public:
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Collection * values();
-private:
-  static const jlong serialVersionUID = 5720150593236309827LL;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dataMap;
-  ::javax::management::openmbean::TabularType * tabularType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_TabularDataSupport__
diff --git a/libjava/javax/management/openmbean/TabularType.h b/libjava/javax/management/openmbean/TabularType.h
deleted file mode 100644
index 071a7049a3d..00000000000
--- a/libjava/javax/management/openmbean/TabularType.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_TabularType__
-#define __javax_management_openmbean_TabularType__
-
-#pragma interface
-
-#include <javax/management/openmbean/OpenType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeType;
-          class TabularType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::TabularType : public ::javax::management::openmbean::OpenType
-{
-
-public:
-  TabularType(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::CompositeType *, JArray< ::java::lang::String * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::util::List * getIndexNames();
-  virtual ::javax::management::openmbean::CompositeType * getRowType();
-  virtual jint hashCode();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 6554071860220659261LL;
-  ::javax::management::openmbean::CompositeType * __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) rowType;
-  ::java::util::List * indexNames;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_TabularType__
diff --git a/libjava/javax/management/remote/NotificationResult.h b/libjava/javax/management/remote/NotificationResult.h
deleted file mode 100644
index b5d45f6b4a6..00000000000
--- a/libjava/javax/management/remote/NotificationResult.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_remote_NotificationResult__
-#define __javax_management_remote_NotificationResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace remote
-      {
-          class NotificationResult;
-          class TargetedNotification;
-      }
-    }
-  }
-}
-
-class javax::management::remote::NotificationResult : public ::java::lang::Object
-{
-
-public:
-  NotificationResult(jlong, jlong, JArray< ::javax::management::remote::TargetedNotification * > *);
-  virtual jlong getEarliestSequenceNumber();
-  virtual jlong getNextSequenceNumber();
-  virtual JArray< ::javax::management::remote::TargetedNotification * > * getTargetedNotifications();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 1191800228721395279LL;
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) earliestSequenceNumber;
-  jlong nextSequenceNumber;
-  JArray< ::javax::management::remote::TargetedNotification * > * targetedNotifications;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_remote_NotificationResult__
diff --git a/libjava/javax/management/remote/TargetedNotification.h b/libjava/javax/management/remote/TargetedNotification.h
deleted file mode 100644
index 1021a872c3a..00000000000
--- a/libjava/javax/management/remote/TargetedNotification.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_remote_TargetedNotification__
-#define __javax_management_remote_TargetedNotification__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-      namespace remote
-      {
-          class TargetedNotification;
-      }
-    }
-  }
-}
-
-class javax::management::remote::TargetedNotification : public ::java::lang::Object
-{
-
-public:
-  TargetedNotification(::javax::management::Notification *, ::java::lang::Integer *);
-  virtual ::javax::management::Notification * getNotification();
-  virtual ::java::lang::Integer * getListenerID();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7676132089779300926LL;
-  ::javax::management::Notification * __attribute__((aligned(__alignof__( ::java::lang::Object)))) notif;
-  ::java::lang::Integer * id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_remote_TargetedNotification__
diff --git a/libjava/javax/management/remote/rmi/RMIConnection.h b/libjava/javax/management/remote/rmi/RMIConnection.h
deleted file mode 100644
index 4fb6eb86d7b..00000000000
--- a/libjava/javax/management/remote/rmi/RMIConnection.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_remote_rmi_RMIConnection__
-#define __javax_management_remote_rmi_RMIConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class AttributeList;
-        class MBeanInfo;
-        class ObjectInstance;
-        class ObjectName;
-      namespace remote
-      {
-          class NotificationResult;
-        namespace rmi
-        {
-            class RMIConnection;
-        }
-      }
-    }
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-      }
-    }
-  }
-}
-
-class javax::management::remote::rmi::RMIConnection : public ::java::lang::Object
-{
-
-public:
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
-  virtual JArray< ::java::lang::Integer * > * addNotificationListeners(JArray< ::javax::management::ObjectName * > *, JArray< ::java::rmi::MarshalledObject * > *, JArray< ::javax::security::auth::Subject * > *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, JArray< ::java::lang::String * > *, ::javax::security::auth::Subject *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, JArray< ::java::lang::String * > *, ::javax::security::auth::Subject *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
-  virtual ::javax::management::remote::NotificationResult * fetchNotifications(jlong, jint, jlong) = 0;
-  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *, ::java::lang::String *, ::javax::security::auth::Subject *) = 0;
-  virtual ::javax::management::AttributeList * getAttributes(::javax::management::ObjectName *, JArray< ::java::lang::String * > *, ::javax::security::auth::Subject *) = 0;
-  virtual ::java::lang::String * getConnectionId() = 0;
-  virtual ::java::lang::String * getDefaultDomain(::javax::security::auth::Subject *) = 0;
-  virtual JArray< ::java::lang::String * > * getDomains(::javax::security::auth::Subject *) = 0;
-  virtual ::java::lang::Integer * getMBeanCount(::javax::security::auth::Subject *) = 0;
-  virtual ::javax::management::MBeanInfo * getMBeanInfo(::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
-  virtual ::javax::management::ObjectInstance * getObjectInstance(::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
-  virtual ::java::lang::Object * invoke(::javax::management::ObjectName *, ::java::lang::String *, ::java::rmi::MarshalledObject *, JArray< ::java::lang::String * > *, ::javax::security::auth::Subject *) = 0;
-  virtual jboolean isInstanceOf(::javax::management::ObjectName *, ::java::lang::String *, ::javax::security::auth::Subject *) = 0;
-  virtual jboolean isRegistered(::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
-  virtual ::java::util::Set * queryMBeans(::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
-  virtual ::java::util::Set * queryNames(::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
-  virtual void removeNotificationListeners(::javax::management::ObjectName *, JArray< ::java::lang::Integer * > *, ::javax::security::auth::Subject *) = 0;
-  virtual void setAttribute(::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
-  virtual void unregisterMBean(::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_remote_rmi_RMIConnection__
diff --git a/libjava/javax/management/remote/rmi/RMIServer.h b/libjava/javax/management/remote/rmi/RMIServer.h
deleted file mode 100644
index 3c955a5010e..00000000000
--- a/libjava/javax/management/remote/rmi/RMIServer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_remote_rmi_RMIServer__
-#define __javax_management_remote_rmi_RMIServer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace remote
-      {
-        namespace rmi
-        {
-            class RMIConnection;
-            class RMIServer;
-        }
-      }
-    }
-  }
-}
-
-class javax::management::remote::rmi::RMIServer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getVersion() = 0;
-  virtual ::javax::management::remote::rmi::RMIConnection * newClient(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_remote_rmi_RMIServer__
diff --git a/libjava/javax/naming/AuthenticationException.h b/libjava/javax/naming/AuthenticationException.h
deleted file mode 100644
index 9f41f0d6825..00000000000
--- a/libjava/javax/naming/AuthenticationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_AuthenticationException__
-#define __javax_naming_AuthenticationException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class AuthenticationException;
-    }
-  }
-}
-
-class javax::naming::AuthenticationException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  AuthenticationException();
-  AuthenticationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3678497619904568096LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_AuthenticationException__
diff --git a/libjava/javax/naming/AuthenticationNotSupportedException.h b/libjava/javax/naming/AuthenticationNotSupportedException.h
deleted file mode 100644
index d55627f1286..00000000000
--- a/libjava/javax/naming/AuthenticationNotSupportedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_AuthenticationNotSupportedException__
-#define __javax_naming_AuthenticationNotSupportedException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class AuthenticationNotSupportedException;
-    }
-  }
-}
-
-class javax::naming::AuthenticationNotSupportedException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  AuthenticationNotSupportedException();
-  AuthenticationNotSupportedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7149033933259492300LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_AuthenticationNotSupportedException__
diff --git a/libjava/javax/naming/BinaryRefAddr.h b/libjava/javax/naming/BinaryRefAddr.h
deleted file mode 100644
index b36ccbd6ae7..00000000000
--- a/libjava/javax/naming/BinaryRefAddr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_BinaryRefAddr__
-#define __javax_naming_BinaryRefAddr__
-
-#pragma interface
-
-#include <javax/naming/RefAddr.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class BinaryRefAddr;
-    }
-  }
-}
-
-class javax::naming::BinaryRefAddr : public ::javax::naming::RefAddr
-{
-
-public:
-  BinaryRefAddr(::java::lang::String *, JArray< jbyte > *);
-  BinaryRefAddr(::java::lang::String *, JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::Object * getContent();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = -3415254970957330361LL;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::javax::naming::RefAddr)))) buf;
-  static JArray< jchar > * hex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_BinaryRefAddr__
diff --git a/libjava/javax/naming/Binding.h b/libjava/javax/naming/Binding.h
deleted file mode 100644
index 06522b4065e..00000000000
--- a/libjava/javax/naming/Binding.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Binding__
-#define __javax_naming_Binding__
-
-#pragma interface
-
-#include <javax/naming/NameClassPair.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Binding;
-    }
-  }
-}
-
-class javax::naming::Binding : public ::javax::naming::NameClassPair
-{
-
-public:
-  Binding(::java::lang::String *, ::java::lang::Object *);
-  Binding(::java::lang::String *, ::java::lang::Object *, jboolean);
-  Binding(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *);
-  Binding(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::Object * getObject();
-  virtual void setObject(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8839217842691845890LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::naming::NameClassPair)))) boundObj;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_Binding__
diff --git a/libjava/javax/naming/CannotProceedException.h b/libjava/javax/naming/CannotProceedException.h
deleted file mode 100644
index 83fe1ec7003..00000000000
--- a/libjava/javax/naming/CannotProceedException.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CannotProceedException__
-#define __javax_naming_CannotProceedException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CannotProceedException : public ::javax::naming::NamingException
-{
-
-public:
-  CannotProceedException();
-  CannotProceedException(::java::lang::String *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual void setEnvironment(::java::util::Hashtable *);
-  virtual ::javax::naming::Name * getRemainingNewName();
-  virtual void setRemainingNewName(::javax::naming::Name *);
-  virtual ::javax::naming::Name * getAltName();
-  virtual void setAltName(::javax::naming::Name *);
-  virtual ::javax::naming::Context * getAltNameCtx();
-  virtual void setAltNameCtx(::javax::naming::Context *);
-private:
-  static const jlong serialVersionUID = 1219724816191576813LL;
-public: // actually protected
-  ::javax::naming::Name * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) remainingNewName;
-  ::java::util::Hashtable * environment;
-  ::javax::naming::Name * altName;
-  ::javax::naming::Context * altNameCtx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CannotProceedException__
diff --git a/libjava/javax/naming/CommunicationException.h b/libjava/javax/naming/CommunicationException.h
deleted file mode 100644
index 1a7a118ec04..00000000000
--- a/libjava/javax/naming/CommunicationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CommunicationException__
-#define __javax_naming_CommunicationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CommunicationException;
-    }
-  }
-}
-
-class javax::naming::CommunicationException : public ::javax::naming::NamingException
-{
-
-public:
-  CommunicationException();
-  CommunicationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3618507780299986611LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CommunicationException__
diff --git a/libjava/javax/naming/CompositeName.h b/libjava/javax/naming/CompositeName.h
deleted file mode 100644
index 8669b7f4b1a..00000000000
--- a/libjava/javax/naming/CompositeName.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CompositeName__
-#define __javax_naming_CompositeName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CompositeName;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CompositeName : public ::java::lang::Object
-{
-
-public:
-  CompositeName();
-public: // actually protected
-  CompositeName(::java::util::Enumeration *);
-public:
-  CompositeName(::java::lang::String *);
-  virtual ::javax::naming::Name * add(jint, ::java::lang::String *);
-  virtual ::javax::naming::Name * add(::java::lang::String *);
-  virtual ::javax::naming::Name * addAll(jint, ::javax::naming::Name *);
-  virtual ::javax::naming::Name * addAll(::javax::naming::Name *);
-  virtual ::java::lang::Object * clone();
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean endsWith(::javax::naming::Name *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * get(jint);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::javax::naming::Name * getPrefix(jint);
-  virtual ::javax::naming::Name * getSuffix(jint);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual jboolean startsWith(::javax::naming::Name *);
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 1667768148915813118LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CompositeName__
diff --git a/libjava/javax/naming/CompoundName.h b/libjava/javax/naming/CompoundName.h
deleted file mode 100644
index a28724b07c6..00000000000
--- a/libjava/javax/naming/CompoundName.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CompoundName__
-#define __javax_naming_CompoundName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CompoundName;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CompoundName : public ::java::lang::Object
-{
-
-  CompoundName(::java::util::Properties *);
-public: // actually protected
-  CompoundName(::java::util::Enumeration *, ::java::util::Properties *);
-public:
-  CompoundName(::java::lang::String *, ::java::util::Properties *);
-  virtual ::javax::naming::Name * add(jint, ::java::lang::String *);
-  virtual ::javax::naming::Name * add(::java::lang::String *);
-  virtual ::javax::naming::Name * addAll(jint, ::javax::naming::Name *);
-  virtual ::javax::naming::Name * addAll(::javax::naming::Name *);
-  virtual ::java::lang::Object * clone();
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean endsWith(::javax::naming::Name *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * get(jint);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::javax::naming::Name * getPrefix(jint);
-  virtual ::javax::naming::Name * getSuffix(jint);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual jboolean startsWith(::javax::naming::Name *);
-private:
-  ::java::lang::String * isSpecial(::java::lang::String *, jint);
-public:
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * canonicalize(::java::lang::String *);
-  void initializeSyntax();
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 3513100557083972036LL;
-public: // actually protected
-  ::java::util::Properties * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mySyntax;
-private:
-  ::java::util::Vector * elts;
-  jint direction;
-  ::java::lang::String * separator;
-  jboolean ignoreCase;
-  ::java::lang::String * escape;
-  ::java::lang::String * beginQuote;
-  ::java::lang::String * endQuote;
-  ::java::lang::String * beginQuote2;
-  ::java::lang::String * endQuote2;
-  jboolean trimBlanks;
-  static const jint RIGHT_TO_LEFT = -1;
-  static const jint LEFT_TO_RIGHT = 1;
-  static const jint FLAT = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CompoundName__
diff --git a/libjava/javax/naming/ConfigurationException.h b/libjava/javax/naming/ConfigurationException.h
deleted file mode 100644
index f59a32a96fe..00000000000
--- a/libjava/javax/naming/ConfigurationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ConfigurationException__
-#define __javax_naming_ConfigurationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ConfigurationException;
-    }
-  }
-}
-
-class javax::naming::ConfigurationException : public ::javax::naming::NamingException
-{
-
-public:
-  ConfigurationException();
-  ConfigurationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2535156726228855704LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ConfigurationException__
diff --git a/libjava/javax/naming/Context.h b/libjava/javax/naming/Context.h
deleted file mode 100644
index c5b5ed8abe6..00000000000
--- a/libjava/javax/naming/Context.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Context__
-#define __javax_naming_Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::Context : public ::java::lang::Object
-{
-
-public:
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static ::java::lang::String * INITIAL_CONTEXT_FACTORY;
-  static ::java::lang::String * OBJECT_FACTORIES;
-  static ::java::lang::String * STATE_FACTORIES;
-  static ::java::lang::String * URL_PKG_PREFIXES;
-  static ::java::lang::String * PROVIDER_URL;
-  static ::java::lang::String * DNS_URL;
-  static ::java::lang::String * AUTHORITATIVE;
-  static ::java::lang::String * BATCHSIZE;
-  static ::java::lang::String * REFERRAL;
-  static ::java::lang::String * SECURITY_PROTOCOL;
-  static ::java::lang::String * SECURITY_AUTHENTICATION;
-  static ::java::lang::String * SECURITY_PRINCIPAL;
-  static ::java::lang::String * SECURITY_CREDENTIALS;
-  static ::java::lang::String * LANGUAGE;
-  static ::java::lang::String * APPLET;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Context__
diff --git a/libjava/javax/naming/ContextNotEmptyException.h b/libjava/javax/naming/ContextNotEmptyException.h
deleted file mode 100644
index 791e89d2b18..00000000000
--- a/libjava/javax/naming/ContextNotEmptyException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ContextNotEmptyException__
-#define __javax_naming_ContextNotEmptyException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ContextNotEmptyException;
-    }
-  }
-}
-
-class javax::naming::ContextNotEmptyException : public ::javax::naming::NamingException
-{
-
-public:
-  ContextNotEmptyException();
-  ContextNotEmptyException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1090963683348219877LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ContextNotEmptyException__
diff --git a/libjava/javax/naming/InitialContext.h b/libjava/javax/naming/InitialContext.h
deleted file mode 100644
index 6eaac2e54a5..00000000000
--- a/libjava/javax/naming/InitialContext.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InitialContext__
-#define __javax_naming_InitialContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class InitialContext;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::InitialContext : public ::java::lang::Object
-{
-
-public:
-  InitialContext(::java::util::Hashtable *);
-public: // actually protected
-  InitialContext(jboolean);
-public:
-  InitialContext();
-public: // actually protected
-  virtual void init(::java::util::Hashtable *);
-public: // actually package-private
-  static void merge(::java::util::Hashtable *, ::java::util::Hashtable *);
-public: // actually protected
-  virtual ::javax::naming::Context * getDefaultInitCtx();
-  virtual ::javax::naming::Context * getURLOrDefaultInitCtx(::javax::naming::Name *);
-  virtual ::javax::naming::Context * getURLOrDefaultInitCtx(::java::lang::String *);
-public:
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookup(::java::lang::String *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *);
-  virtual void unbind(::javax::naming::Name *);
-  virtual void unbind(::java::lang::String *);
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual void rename(::java::lang::String *, ::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *);
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *);
-  virtual void destroySubcontext(::javax::naming::Name *);
-  virtual void destroySubcontext(::java::lang::String *);
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *);
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *);
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *);
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *);
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *);
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual void close();
-  virtual ::java::lang::String * getNameInNamespace();
-public: // actually protected
-  ::javax::naming::Context * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultInitCtx;
-  jboolean gotDefault;
-  ::java::util::Hashtable * myProps;
-public: // actually package-private
-  static ::java::util::HashSet * colon_list;
-  static JArray< ::java::lang::String * > * use_properties;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InitialContext__
diff --git a/libjava/javax/naming/InsufficientResourcesException.h b/libjava/javax/naming/InsufficientResourcesException.h
deleted file mode 100644
index d3fc6603c03..00000000000
--- a/libjava/javax/naming/InsufficientResourcesException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InsufficientResourcesException__
-#define __javax_naming_InsufficientResourcesException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InsufficientResourcesException;
-    }
-  }
-}
-
-class javax::naming::InsufficientResourcesException : public ::javax::naming::NamingException
-{
-
-public:
-  InsufficientResourcesException();
-  InsufficientResourcesException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6227672693037844532LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InsufficientResourcesException__
diff --git a/libjava/javax/naming/InterruptedNamingException.h b/libjava/javax/naming/InterruptedNamingException.h
deleted file mode 100644
index f13b87bb7ad..00000000000
--- a/libjava/javax/naming/InterruptedNamingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InterruptedNamingException__
-#define __javax_naming_InterruptedNamingException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InterruptedNamingException;
-    }
-  }
-}
-
-class javax::naming::InterruptedNamingException : public ::javax::naming::NamingException
-{
-
-public:
-  InterruptedNamingException();
-  InterruptedNamingException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6404516648893194728LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InterruptedNamingException__
diff --git a/libjava/javax/naming/InvalidNameException.h b/libjava/javax/naming/InvalidNameException.h
deleted file mode 100644
index 47e17576825..00000000000
--- a/libjava/javax/naming/InvalidNameException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InvalidNameException__
-#define __javax_naming_InvalidNameException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InvalidNameException;
-    }
-  }
-}
-
-class javax::naming::InvalidNameException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidNameException();
-  InvalidNameException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8370672380823801105LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InvalidNameException__
diff --git a/libjava/javax/naming/LimitExceededException.h b/libjava/javax/naming/LimitExceededException.h
deleted file mode 100644
index f6d6fdafa3d..00000000000
--- a/libjava/javax/naming/LimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LimitExceededException__
-#define __javax_naming_LimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LimitExceededException;
-    }
-  }
-}
-
-class javax::naming::LimitExceededException : public ::javax::naming::NamingException
-{
-
-public:
-  LimitExceededException();
-  LimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -776898738660207856LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LimitExceededException__
diff --git a/libjava/javax/naming/LinkException.h b/libjava/javax/naming/LinkException.h
deleted file mode 100644
index 9949157b2ea..00000000000
--- a/libjava/javax/naming/LinkException.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkException__
-#define __javax_naming_LinkException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkException;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::LinkException : public ::javax::naming::NamingException
-{
-
-public:
-  LinkException();
-  LinkException(::java::lang::String *);
-  virtual ::javax::naming::Name * getLinkResolvedName();
-  virtual ::javax::naming::Name * getLinkRemainingName();
-  virtual ::java::lang::Object * getLinkResolvedObj();
-  virtual ::java::lang::String * getLinkExplanation();
-  virtual void setLinkExplanation(::java::lang::String *);
-  virtual void setLinkResolvedName(::javax::naming::Name *);
-  virtual void setLinkRemainingName(::javax::naming::Name *);
-  virtual void setLinkResolvedObj(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jboolean);
-private:
-  static const jlong serialVersionUID = -7967662604076777712LL;
-public: // actually protected
-  ::javax::naming::Name * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) linkResolvedName;
-  ::java::lang::Object * linkResolvedObj;
-  ::javax::naming::Name * linkRemainingName;
-  ::java::lang::String * linkExplanation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkException__
diff --git a/libjava/javax/naming/LinkLoopException.h b/libjava/javax/naming/LinkLoopException.h
deleted file mode 100644
index 4ca06dd9819..00000000000
--- a/libjava/javax/naming/LinkLoopException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkLoopException__
-#define __javax_naming_LinkLoopException__
-
-#pragma interface
-
-#include <javax/naming/LinkException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkLoopException;
-    }
-  }
-}
-
-class javax::naming::LinkLoopException : public ::javax::naming::LinkException
-{
-
-public:
-  LinkLoopException();
-  LinkLoopException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3119189944325198009LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkLoopException__
diff --git a/libjava/javax/naming/LinkRef.h b/libjava/javax/naming/LinkRef.h
deleted file mode 100644
index 3ef79dcf56d..00000000000
--- a/libjava/javax/naming/LinkRef.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkRef__
-#define __javax_naming_LinkRef__
-
-#pragma interface
-
-#include <javax/naming/Reference.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkRef;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::LinkRef : public ::javax::naming::Reference
-{
-
-public:
-  LinkRef(::javax::naming::Name *);
-  LinkRef(::java::lang::String *);
-  virtual ::java::lang::String * getLinkName();
-private:
-  static const jlong serialVersionUID = -5386290613498931298LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkRef__
diff --git a/libjava/javax/naming/MalformedLinkException.h b/libjava/javax/naming/MalformedLinkException.h
deleted file mode 100644
index 982cf900df3..00000000000
--- a/libjava/javax/naming/MalformedLinkException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_MalformedLinkException__
-#define __javax_naming_MalformedLinkException__
-
-#pragma interface
-
-#include <javax/naming/LinkException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class MalformedLinkException;
-    }
-  }
-}
-
-class javax::naming::MalformedLinkException : public ::javax::naming::LinkException
-{
-
-public:
-  MalformedLinkException();
-  MalformedLinkException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3066740437737830242LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_MalformedLinkException__
diff --git a/libjava/javax/naming/Name.h b/libjava/javax/naming/Name.h
deleted file mode 100644
index 4a4dd9942e8..00000000000
--- a/libjava/javax/naming/Name.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Name__
-#define __javax_naming_Name__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-    }
-  }
-}
-
-class javax::naming::Name : public ::java::lang::Object
-{
-
-public:
-  virtual jint size() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Enumeration * getAll() = 0;
-  virtual ::java::lang::String * get(jint) = 0;
-  virtual ::javax::naming::Name * getPrefix(jint) = 0;
-  virtual ::javax::naming::Name * getSuffix(jint) = 0;
-  virtual ::javax::naming::Name * add(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * add(jint, ::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * addAll(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Name * addAll(jint, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * remove(jint) = 0;
-  virtual jboolean startsWith(::javax::naming::Name *) = 0;
-  virtual jboolean endsWith(::javax::naming::Name *) = 0;
-  virtual jint compareTo(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static const jlong serialVersionUID = -3617482732056931635LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Name__
diff --git a/libjava/javax/naming/NameAlreadyBoundException.h b/libjava/javax/naming/NameAlreadyBoundException.h
deleted file mode 100644
index dd6a952152d..00000000000
--- a/libjava/javax/naming/NameAlreadyBoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameAlreadyBoundException__
-#define __javax_naming_NameAlreadyBoundException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameAlreadyBoundException;
-    }
-  }
-}
-
-class javax::naming::NameAlreadyBoundException : public ::javax::naming::NamingException
-{
-
-public:
-  NameAlreadyBoundException();
-  NameAlreadyBoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8491441000356780586LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameAlreadyBoundException__
diff --git a/libjava/javax/naming/NameClassPair.h b/libjava/javax/naming/NameClassPair.h
deleted file mode 100644
index 690c31e9082..00000000000
--- a/libjava/javax/naming/NameClassPair.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameClassPair__
-#define __javax_naming_NameClassPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameClassPair;
-    }
-  }
-}
-
-class javax::naming::NameClassPair : public ::java::lang::Object
-{
-
-public:
-  NameClassPair(::java::lang::String *, ::java::lang::String *);
-  NameClassPair(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getName();
-  virtual jboolean isRelative();
-  virtual void setClassName(::java::lang::String *);
-  virtual void setName(::java::lang::String *);
-  virtual void setRelative(jboolean);
-  virtual void setNameInNamespace(::java::lang::String *);
-  virtual ::java::lang::String * getNameInNamespace();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5620776610160863339LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * className;
-  jboolean isRel;
-  ::java::lang::String * fullName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameClassPair__
diff --git a/libjava/javax/naming/NameNotFoundException.h b/libjava/javax/naming/NameNotFoundException.h
deleted file mode 100644
index 079d5a02c16..00000000000
--- a/libjava/javax/naming/NameNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameNotFoundException__
-#define __javax_naming_NameNotFoundException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameNotFoundException;
-    }
-  }
-}
-
-class javax::naming::NameNotFoundException : public ::javax::naming::NamingException
-{
-
-public:
-  NameNotFoundException();
-  NameNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8007156725367842053LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameNotFoundException__
diff --git a/libjava/javax/naming/NameParser.h b/libjava/javax/naming/NameParser.h
deleted file mode 100644
index 502fcaec43a..00000000000
--- a/libjava/javax/naming/NameParser.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameParser__
-#define __javax_naming_NameParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NameParser;
-    }
-  }
-}
-
-class javax::naming::NameParser : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Name * parse(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_NameParser__
diff --git a/libjava/javax/naming/NamingEnumeration.h b/libjava/javax/naming/NamingEnumeration.h
deleted file mode 100644
index 7d848ce1a2c..00000000000
--- a/libjava/javax/naming/NamingEnumeration.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingEnumeration__
-#define __javax_naming_NamingEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::NamingEnumeration : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * next() = 0;
-  virtual jboolean hasMore() = 0;
-  virtual void close() = 0;
-  virtual jboolean hasMoreElements() = 0;
-  virtual ::java::lang::Object * nextElement() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_NamingEnumeration__
diff --git a/libjava/javax/naming/NamingException.h b/libjava/javax/naming/NamingException.h
deleted file mode 100644
index 75a5ae9951c..00000000000
--- a/libjava/javax/naming/NamingException.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingException__
-#define __javax_naming_NamingException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NamingException;
-    }
-  }
-}
-
-class javax::naming::NamingException : public ::java::lang::Exception
-{
-
-public:
-  NamingException();
-  NamingException(::java::lang::String *);
-  virtual ::java::lang::Throwable * getRootCause();
-  virtual void setRootCause(::java::lang::Throwable *);
-  virtual ::javax::naming::Name * getResolvedName();
-  virtual void setResolvedName(::javax::naming::Name *);
-  virtual ::java::lang::Object * getResolvedObj();
-  virtual void setResolvedObj(::java::lang::Object *);
-  virtual ::javax::naming::Name * getRemainingName();
-  virtual void setRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingComponent(::java::lang::String *);
-  virtual ::java::lang::String * getExplanation();
-  virtual ::java::lang::String * toString(jboolean);
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = -1299181962103167177LL;
-public: // actually protected
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) rootException;
-  ::javax::naming::Name * resolvedName;
-  ::java::lang::Object * resolvedObj;
-  ::javax::naming::Name * remainingName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NamingException__
diff --git a/libjava/javax/naming/NamingSecurityException.h b/libjava/javax/naming/NamingSecurityException.h
deleted file mode 100644
index e2e2a491111..00000000000
--- a/libjava/javax/naming/NamingSecurityException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingSecurityException__
-#define __javax_naming_NamingSecurityException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingSecurityException;
-    }
-  }
-}
-
-class javax::naming::NamingSecurityException : public ::javax::naming::NamingException
-{
-
-public:
-  NamingSecurityException();
-  NamingSecurityException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5855287647294685775LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NamingSecurityException__
diff --git a/libjava/javax/naming/NoInitialContextException.h b/libjava/javax/naming/NoInitialContextException.h
deleted file mode 100644
index e598071d16e..00000000000
--- a/libjava/javax/naming/NoInitialContextException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NoInitialContextException__
-#define __javax_naming_NoInitialContextException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NoInitialContextException;
-    }
-  }
-}
-
-class javax::naming::NoInitialContextException : public ::javax::naming::NamingException
-{
-
-public:
-  NoInitialContextException();
-  NoInitialContextException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3413733186901258623LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NoInitialContextException__
diff --git a/libjava/javax/naming/NoPermissionException.h b/libjava/javax/naming/NoPermissionException.h
deleted file mode 100644
index d96556d9006..00000000000
--- a/libjava/javax/naming/NoPermissionException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NoPermissionException__
-#define __javax_naming_NoPermissionException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NoPermissionException;
-    }
-  }
-}
-
-class javax::naming::NoPermissionException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  NoPermissionException();
-  NoPermissionException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8395332708699751775LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NoPermissionException__
diff --git a/libjava/javax/naming/NotContextException.h b/libjava/javax/naming/NotContextException.h
deleted file mode 100644
index fd488ffb773..00000000000
--- a/libjava/javax/naming/NotContextException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NotContextException__
-#define __javax_naming_NotContextException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NotContextException;
-    }
-  }
-}
-
-class javax::naming::NotContextException : public ::javax::naming::NamingException
-{
-
-public:
-  NotContextException();
-  NotContextException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 849752551644540417LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NotContextException__
diff --git a/libjava/javax/naming/OperationNotSupportedException.h b/libjava/javax/naming/OperationNotSupportedException.h
deleted file mode 100644
index 7bf8c0fd5e0..00000000000
--- a/libjava/javax/naming/OperationNotSupportedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_OperationNotSupportedException__
-#define __javax_naming_OperationNotSupportedException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class OperationNotSupportedException;
-    }
-  }
-}
-
-class javax::naming::OperationNotSupportedException : public ::javax::naming::NamingException
-{
-
-public:
-  OperationNotSupportedException();
-  OperationNotSupportedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5493232822427682064LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_OperationNotSupportedException__
diff --git a/libjava/javax/naming/PartialResultException.h b/libjava/javax/naming/PartialResultException.h
deleted file mode 100644
index 9de177ae902..00000000000
--- a/libjava/javax/naming/PartialResultException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_PartialResultException__
-#define __javax_naming_PartialResultException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class PartialResultException;
-    }
-  }
-}
-
-class javax::naming::PartialResultException : public ::javax::naming::NamingException
-{
-
-public:
-  PartialResultException();
-  PartialResultException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2572144970049426786LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_PartialResultException__
diff --git a/libjava/javax/naming/RefAddr.h b/libjava/javax/naming/RefAddr.h
deleted file mode 100644
index f124428fd2d..00000000000
--- a/libjava/javax/naming/RefAddr.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_RefAddr__
-#define __javax_naming_RefAddr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class RefAddr;
-    }
-  }
-}
-
-class javax::naming::RefAddr : public ::java::lang::Object
-{
-
-public: // actually protected
-  RefAddr(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::Object * getContent() = 0;
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) addrType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_RefAddr__
diff --git a/libjava/javax/naming/Reference.h b/libjava/javax/naming/Reference.h
deleted file mode 100644
index 62325ce333a..00000000000
--- a/libjava/javax/naming/Reference.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Reference__
-#define __javax_naming_Reference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class RefAddr;
-        class Reference;
-    }
-  }
-}
-
-class javax::naming::Reference : public ::java::lang::Object
-{
-
-public:
-  Reference(::java::lang::String *);
-  Reference(::java::lang::String *, ::javax::naming::RefAddr *);
-  Reference(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  Reference(::java::lang::String *, ::javax::naming::RefAddr *, ::java::lang::String *, ::java::lang::String *);
-  virtual void add(jint, ::javax::naming::RefAddr *);
-  virtual void add(::javax::naming::RefAddr *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-private:
-  jboolean equals(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::naming::RefAddr * get(jint);
-  virtual ::javax::naming::RefAddr * get(::java::lang::String *);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getFactoryClassLocation();
-  virtual ::java::lang::String * getFactoryClassName();
-  virtual jint hashCode();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1673475790065791735LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) addrs;
-  ::java::lang::String * classFactory;
-  ::java::lang::String * classFactoryLocation;
-  ::java::lang::String * className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_Reference__
diff --git a/libjava/javax/naming/Referenceable.h b/libjava/javax/naming/Referenceable.h
deleted file mode 100644
index a2d09b6863f..00000000000
--- a/libjava/javax/naming/Referenceable.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Referenceable__
-#define __javax_naming_Referenceable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Reference;
-        class Referenceable;
-    }
-  }
-}
-
-class javax::naming::Referenceable : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Reference * getReference() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Referenceable__
diff --git a/libjava/javax/naming/ReferralException.h b/libjava/javax/naming/ReferralException.h
deleted file mode 100644
index 7c26d973bff..00000000000
--- a/libjava/javax/naming/ReferralException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ReferralException__
-#define __javax_naming_ReferralException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class ReferralException;
-    }
-  }
-}
-
-class javax::naming::ReferralException : public ::javax::naming::NamingException
-{
-
-public: // actually protected
-  ReferralException();
-  ReferralException(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * getReferralInfo() = 0;
-  virtual ::javax::naming::Context * getReferralContext() = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *) = 0;
-  virtual jboolean skipReferral() = 0;
-  virtual void retryReferral() = 0;
-private:
-  static const jlong serialVersionUID = -2881363844695698876LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ReferralException__
diff --git a/libjava/javax/naming/ServiceUnavailableException.h b/libjava/javax/naming/ServiceUnavailableException.h
deleted file mode 100644
index 4f90524535a..00000000000
--- a/libjava/javax/naming/ServiceUnavailableException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ServiceUnavailableException__
-#define __javax_naming_ServiceUnavailableException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ServiceUnavailableException;
-    }
-  }
-}
-
-class javax::naming::ServiceUnavailableException : public ::javax::naming::NamingException
-{
-
-public:
-  ServiceUnavailableException();
-  ServiceUnavailableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4996964726566773444LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ServiceUnavailableException__
diff --git a/libjava/javax/naming/SizeLimitExceededException.h b/libjava/javax/naming/SizeLimitExceededException.h
deleted file mode 100644
index d4744b1241c..00000000000
--- a/libjava/javax/naming/SizeLimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_SizeLimitExceededException__
-#define __javax_naming_SizeLimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/LimitExceededException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class SizeLimitExceededException;
-    }
-  }
-}
-
-class javax::naming::SizeLimitExceededException : public ::javax::naming::LimitExceededException
-{
-
-public:
-  SizeLimitExceededException();
-  SizeLimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7129289564879168579LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_SizeLimitExceededException__
diff --git a/libjava/javax/naming/StringRefAddr.h b/libjava/javax/naming/StringRefAddr.h
deleted file mode 100644
index c7bd0c84ba4..00000000000
--- a/libjava/javax/naming/StringRefAddr.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_StringRefAddr__
-#define __javax_naming_StringRefAddr__
-
-#pragma interface
-
-#include <javax/naming/RefAddr.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class StringRefAddr;
-    }
-  }
-}
-
-class javax::naming::StringRefAddr : public ::javax::naming::RefAddr
-{
-
-public:
-  StringRefAddr(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * getContent();
-private:
-  static const jlong serialVersionUID = -8913762495138505527LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::naming::RefAddr)))) contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_StringRefAddr__
diff --git a/libjava/javax/naming/TimeLimitExceededException.h b/libjava/javax/naming/TimeLimitExceededException.h
deleted file mode 100644
index 4c555fbb27c..00000000000
--- a/libjava/javax/naming/TimeLimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_TimeLimitExceededException__
-#define __javax_naming_TimeLimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/LimitExceededException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class TimeLimitExceededException;
-    }
-  }
-}
-
-class javax::naming::TimeLimitExceededException : public ::javax::naming::LimitExceededException
-{
-
-public:
-  TimeLimitExceededException();
-  TimeLimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3597009011385034696LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_TimeLimitExceededException__
diff --git a/libjava/javax/naming/directory/Attribute.h b/libjava/javax/naming/directory/Attribute.h
deleted file mode 100644
index 4c8a92d270c..00000000000
--- a/libjava/javax/naming/directory/Attribute.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_Attribute__
-#define __javax_naming_directory_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class DirContext;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::Attribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::NamingEnumeration * getAll() = 0;
-  virtual ::java::lang::Object * get() = 0;
-  virtual jint size() = 0;
-  virtual ::java::lang::String * getID() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual void clear() = 0;
-  virtual ::javax::naming::directory::DirContext * getAttributeSyntaxDefinition() = 0;
-  virtual ::javax::naming::directory::DirContext * getAttributeDefinition() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean isOrdered() = 0;
-  virtual ::java::lang::Object * get(jint) = 0;
-  virtual ::java::lang::Object * remove(jint) = 0;
-  virtual void add(jint, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *) = 0;
-  static const jlong serialVersionUID = 8707690322213556804LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_Attribute__
diff --git a/libjava/javax/naming/directory/AttributeInUseException.h b/libjava/javax/naming/directory/AttributeInUseException.h
deleted file mode 100644
index 5062ab562ef..00000000000
--- a/libjava/javax/naming/directory/AttributeInUseException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_AttributeInUseException__
-#define __javax_naming_directory_AttributeInUseException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class AttributeInUseException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::AttributeInUseException : public ::javax::naming::NamingException
-{
-
-public:
-  AttributeInUseException();
-  AttributeInUseException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4437710305529322564LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_AttributeInUseException__
diff --git a/libjava/javax/naming/directory/AttributeModificationException.h b/libjava/javax/naming/directory/AttributeModificationException.h
deleted file mode 100644
index e113e32dac7..00000000000
--- a/libjava/javax/naming/directory/AttributeModificationException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_AttributeModificationException__
-#define __javax_naming_directory_AttributeModificationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class AttributeModificationException;
-          class ModificationItem;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::AttributeModificationException : public ::javax::naming::NamingException
-{
-
-public:
-  AttributeModificationException();
-  AttributeModificationException(::java::lang::String *);
-  virtual void setUnexecutedModifications(JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual JArray< ::javax::naming::directory::ModificationItem * > * getUnexecutedModifications();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8060676069678710186LL;
-  JArray< ::javax::naming::directory::ModificationItem * > * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) unexecs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_AttributeModificationException__
diff --git a/libjava/javax/naming/directory/Attributes.h b/libjava/javax/naming/directory/Attributes.h
deleted file mode 100644
index 31525e190bc..00000000000
--- a/libjava/javax/naming/directory/Attributes.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_Attributes__
-#define __javax_naming_directory_Attributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class Attributes;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::Attributes : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isCaseIgnored() = 0;
-  virtual jint size() = 0;
-  virtual ::javax::naming::directory::Attribute * get(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * getAll() = 0;
-  virtual ::javax::naming::NamingEnumeration * getIDs() = 0;
-  virtual ::javax::naming::directory::Attribute * put(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::javax::naming::directory::Attribute * put(::javax::naming::directory::Attribute *) = 0;
-  virtual ::javax::naming::directory::Attribute * remove(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_Attributes__
diff --git a/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h b/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h
deleted file mode 100644
index df2a00da452..00000000000
--- a/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
-#define __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class BasicAttribute;
-          class BasicAttribute$BasicAttributeEnumeration;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttribute$BasicAttributeEnumeration : public ::java::lang::Object
-{
-
-public:
-  BasicAttribute$BasicAttributeEnumeration(::javax::naming::directory::BasicAttribute *);
-  virtual void close();
-  virtual jboolean hasMore();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) where;
-  ::javax::naming::directory::BasicAttribute * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
diff --git a/libjava/javax/naming/directory/BasicAttribute.h b/libjava/javax/naming/directory/BasicAttribute.h
deleted file mode 100644
index 2d56a62b0ce..00000000000
--- a/libjava/javax/naming/directory/BasicAttribute.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttribute__
-#define __javax_naming_directory_BasicAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class BasicAttribute;
-          class DirContext;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttribute : public ::java::lang::Object
-{
-
-  BasicAttribute();
-public:
-  BasicAttribute(::java::lang::String *);
-  BasicAttribute(::java::lang::String *, jboolean);
-  BasicAttribute(::java::lang::String *, ::java::lang::Object *);
-  BasicAttribute(::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get();
-  virtual ::java::lang::Object * get(jint);
-  virtual ::javax::naming::NamingEnumeration * getAll();
-  virtual ::javax::naming::directory::DirContext * getAttributeDefinition();
-  virtual ::javax::naming::directory::DirContext * getAttributeSyntaxDefinition();
-  virtual ::java::lang::String * getID();
-  virtual jint hashCode();
-  virtual jboolean isOrdered();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 6743528196119291326LL;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrID;
-  jboolean ordered;
-  ::java::util::Vector * values;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttribute__
diff --git a/libjava/javax/naming/directory/BasicAttributes$1.h b/libjava/javax/naming/directory/BasicAttributes$1.h
deleted file mode 100644
index 13478fe12f9..00000000000
--- a/libjava/javax/naming/directory/BasicAttributes$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttributes$1__
-#define __javax_naming_directory_BasicAttributes$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class BasicAttributes;
-          class BasicAttributes$1;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttributes$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicAttributes$1(::javax::naming::directory::BasicAttributes *, ::javax::naming::NamingEnumeration *);
-public:
-  virtual jboolean hasMore();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::String * BasicAttributes$1$next();
-  virtual ::java::lang::String * BasicAttributes$1$nextElement();
-  virtual void close();
-  virtual ::java::lang::Object * next();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::javax::naming::directory::BasicAttributes * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::naming::NamingEnumeration * val$attrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttributes$1__
diff --git a/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h b/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
deleted file mode 100644
index 4b787eb0d2a..00000000000
--- a/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
-#define __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attribute;
-          class BasicAttributes;
-          class BasicAttributes$BasicAttributesEnumeration;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttributes$BasicAttributesEnumeration : public ::java::lang::Object
-{
-
-public:
-  BasicAttributes$BasicAttributesEnumeration(::javax::naming::directory::BasicAttributes *);
-  virtual void close();
-  virtual jboolean hasMore();
-  virtual ::javax::naming::directory::Attribute * BasicAttributes$BasicAttributesEnumeration$next();
-  virtual jboolean hasMoreElements();
-  virtual ::javax::naming::directory::Attribute * BasicAttributes$BasicAttributesEnumeration$nextElement();
-  virtual ::java::lang::Object * next();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) where;
-  ::javax::naming::directory::BasicAttributes * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
diff --git a/libjava/javax/naming/directory/BasicAttributes.h b/libjava/javax/naming/directory/BasicAttributes.h
deleted file mode 100644
index 89436721f18..00000000000
--- a/libjava/javax/naming/directory/BasicAttributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttributes__
-#define __javax_naming_directory_BasicAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class BasicAttributes;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttributes : public ::java::lang::Object
-{
-
-public:
-  BasicAttributes();
-  BasicAttributes(jboolean);
-  BasicAttributes(::java::lang::String *, ::java::lang::Object *);
-  BasicAttributes(::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::naming::directory::Attribute * get(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * getAll();
-  virtual ::javax::naming::NamingEnumeration * getIDs();
-  virtual jint hashCode();
-  virtual jboolean isCaseIgnored();
-  virtual ::javax::naming::directory::Attribute * put(::javax::naming::directory::Attribute *);
-  virtual ::javax::naming::directory::Attribute * put(::java::lang::String *, ::java::lang::Object *);
-  virtual ::javax::naming::directory::Attribute * remove(::java::lang::String *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 4980164073184639448LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) ignoreCase;
-public: // actually package-private
-  ::java::util::Vector * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttributes__
diff --git a/libjava/javax/naming/directory/DirContext.h b/libjava/javax/naming/directory/DirContext.h
deleted file mode 100644
index 41126211b4b..00000000000
--- a/libjava/javax/naming/directory/DirContext.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_DirContext__
-#define __javax_naming_directory_DirContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::DirContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static const jint ADD_ATTRIBUTE = 1;
-  static const jint REPLACE_ATTRIBUTE = 2;
-  static const jint REMOVE_ATTRIBUTE = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_DirContext__
diff --git a/libjava/javax/naming/directory/InitialDirContext.h b/libjava/javax/naming/directory/InitialDirContext.h
deleted file mode 100644
index 6e8712eb66a..00000000000
--- a/libjava/javax/naming/directory/InitialDirContext.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InitialDirContext__
-#define __javax_naming_directory_InitialDirContext__
-
-#pragma interface
-
-#include <javax/naming/InitialContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class InitialDirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InitialDirContext : public ::javax::naming::InitialContext
-{
-
-public:
-  InitialDirContext();
-public: // actually protected
-  InitialDirContext(jboolean);
-public:
-  InitialDirContext(::java::util::Hashtable *);
-private:
-  ::javax::naming::directory::DirContext * getURLOrDefaultInitDirCtx(::javax::naming::Name *);
-  ::javax::naming::directory::DirContext * getURLOrDefaultInitDirCtx(::java::lang::String *);
-public:
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *);
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *);
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *);
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *);
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *);
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *);
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InitialDirContext__
diff --git a/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h b/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h
deleted file mode 100644
index 23c341a4aad..00000000000
--- a/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributeIdentifierException__
-#define __javax_naming_directory_InvalidAttributeIdentifierException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributeIdentifierException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributeIdentifierException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributeIdentifierException();
-  InvalidAttributeIdentifierException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9036920266322999923LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributeIdentifierException__
diff --git a/libjava/javax/naming/directory/InvalidAttributeValueException.h b/libjava/javax/naming/directory/InvalidAttributeValueException.h
deleted file mode 100644
index c8d55fe366c..00000000000
--- a/libjava/javax/naming/directory/InvalidAttributeValueException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributeValueException__
-#define __javax_naming_directory_InvalidAttributeValueException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributeValueException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributeValueException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributeValueException();
-  InvalidAttributeValueException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8720050295499275011LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributeValueException__
diff --git a/libjava/javax/naming/directory/InvalidAttributesException.h b/libjava/javax/naming/directory/InvalidAttributesException.h
deleted file mode 100644
index 3bbb5bfb554..00000000000
--- a/libjava/javax/naming/directory/InvalidAttributesException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributesException__
-#define __javax_naming_directory_InvalidAttributesException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributesException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributesException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributesException();
-  InvalidAttributesException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2607612850539889765LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributesException__
diff --git a/libjava/javax/naming/directory/InvalidSearchControlsException.h b/libjava/javax/naming/directory/InvalidSearchControlsException.h
deleted file mode 100644
index 58884397513..00000000000
--- a/libjava/javax/naming/directory/InvalidSearchControlsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidSearchControlsException__
-#define __javax_naming_directory_InvalidSearchControlsException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidSearchControlsException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidSearchControlsException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidSearchControlsException();
-  InvalidSearchControlsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5124108943352665777LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidSearchControlsException__
diff --git a/libjava/javax/naming/directory/InvalidSearchFilterException.h b/libjava/javax/naming/directory/InvalidSearchFilterException.h
deleted file mode 100644
index 5901c07bc4a..00000000000
--- a/libjava/javax/naming/directory/InvalidSearchFilterException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidSearchFilterException__
-#define __javax_naming_directory_InvalidSearchFilterException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidSearchFilterException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidSearchFilterException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidSearchFilterException();
-  InvalidSearchFilterException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2902700940682875441LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidSearchFilterException__
diff --git a/libjava/javax/naming/directory/ModificationItem.h b/libjava/javax/naming/directory/ModificationItem.h
deleted file mode 100644
index faf055b9086..00000000000
--- a/libjava/javax/naming/directory/ModificationItem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_ModificationItem__
-#define __javax_naming_directory_ModificationItem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attribute;
-          class ModificationItem;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::ModificationItem : public ::java::lang::Object
-{
-
-public:
-  ModificationItem(jint, ::javax::naming::directory::Attribute *);
-  virtual jint getModificationOp();
-  virtual ::javax::naming::directory::Attribute * getAttribute();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7573258562534746850LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) mod_op;
-  ::javax::naming::directory::Attribute * attr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_ModificationItem__
diff --git a/libjava/javax/naming/directory/NoSuchAttributeException.h b/libjava/javax/naming/directory/NoSuchAttributeException.h
deleted file mode 100644
index 501daeef868..00000000000
--- a/libjava/javax/naming/directory/NoSuchAttributeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_NoSuchAttributeException__
-#define __javax_naming_directory_NoSuchAttributeException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class NoSuchAttributeException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::NoSuchAttributeException : public ::javax::naming::NamingException
-{
-
-public:
-  NoSuchAttributeException();
-  NoSuchAttributeException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4836415647935888137LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_NoSuchAttributeException__
diff --git a/libjava/javax/naming/directory/SchemaViolationException.h b/libjava/javax/naming/directory/SchemaViolationException.h
deleted file mode 100644
index 444f14c6cd7..00000000000
--- a/libjava/javax/naming/directory/SchemaViolationException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SchemaViolationException__
-#define __javax_naming_directory_SchemaViolationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class SchemaViolationException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SchemaViolationException : public ::javax::naming::NamingException
-{
-
-public:
-  SchemaViolationException();
-  SchemaViolationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3041762429525049663LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SchemaViolationException__
diff --git a/libjava/javax/naming/directory/SearchControls.h b/libjava/javax/naming/directory/SearchControls.h
deleted file mode 100644
index 1c39ba8f84b..00000000000
--- a/libjava/javax/naming/directory/SearchControls.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SearchControls__
-#define __javax_naming_directory_SearchControls__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SearchControls : public ::java::lang::Object
-{
-
-public:
-  SearchControls();
-  SearchControls(jint, jlong, jint, JArray< ::java::lang::String * > *, jboolean, jboolean);
-  virtual jint getSearchScope();
-  virtual jint getTimeLimit();
-  virtual jboolean getDerefLinkFlag();
-  virtual jboolean getReturningObjFlag();
-  virtual jlong getCountLimit();
-  virtual JArray< ::java::lang::String * > * getReturningAttributes();
-  virtual void setSearchScope(jint);
-  virtual void setTimeLimit(jint);
-  virtual void setDerefLinkFlag(jboolean);
-  virtual void setReturningObjFlag(jboolean);
-  virtual void setCountLimit(jlong);
-  virtual void setReturningAttributes(JArray< ::java::lang::String * > *);
-private:
-  static const jlong serialVersionUID = -2480540967773454797LL;
-public:
-  static const jint OBJECT_SCOPE = 0;
-  static const jint ONELEVEL_SCOPE = 1;
-  static const jint SUBTREE_SCOPE = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) searchScope;
-  jint timeLimit;
-  jboolean derefLink;
-  jboolean returnObj;
-  jlong countLimit;
-  JArray< ::java::lang::String * > * attributesToReturn;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SearchControls__
diff --git a/libjava/javax/naming/directory/SearchResult.h b/libjava/javax/naming/directory/SearchResult.h
deleted file mode 100644
index ac89020a465..00000000000
--- a/libjava/javax/naming/directory/SearchResult.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SearchResult__
-#define __javax_naming_directory_SearchResult__
-
-#pragma interface
-
-#include <javax/naming/Binding.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attributes;
-          class SearchResult;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SearchResult : public ::javax::naming::Binding
-{
-
-public:
-  SearchResult(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  SearchResult(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *, jboolean);
-  SearchResult(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  SearchResult(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *, jboolean);
-  virtual ::javax::naming::directory::Attributes * getAttributes();
-  virtual void setAttributes(::javax::naming::directory::Attributes *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -9158063327699723172LL;
-  ::javax::naming::directory::Attributes * __attribute__((aligned(__alignof__( ::javax::naming::Binding)))) attrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SearchResult__
diff --git a/libjava/javax/naming/event/EventContext.h b/libjava/javax/naming/event/EventContext.h
deleted file mode 100644
index 3fbbfc2a561..00000000000
--- a/libjava/javax/naming/event/EventContext.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_EventContext__
-#define __javax_naming_event_EventContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace event
-      {
-          class EventContext;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::EventContext : public ::java::lang::Object
-{
-
-public:
-  virtual void addNamingListener(::javax::naming::Name *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void removeNamingListener(::javax::naming::event::NamingListener *) = 0;
-  virtual jboolean targetMustExist() = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static const jint OBJECT_SCOPE = 0;
-  static const jint ONELEVEL_SCOPE = 1;
-  static const jint SUBTREE_SCOPE = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_EventContext__
diff --git a/libjava/javax/naming/event/EventDirContext.h b/libjava/javax/naming/event/EventDirContext.h
deleted file mode 100644
index 2efa0c28495..00000000000
--- a/libjava/javax/naming/event/EventDirContext.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_EventDirContext__
-#define __javax_naming_event_EventDirContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-      namespace event
-      {
-          class EventDirContext;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::EventDirContext : public ::java::lang::Object
-{
-
-public:
-  virtual void addNamingListener(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::javax::naming::Name *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void removeNamingListener(::javax::naming::event::NamingListener *) = 0;
-  virtual jboolean targetMustExist() = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_EventDirContext__
diff --git a/libjava/javax/naming/event/NamespaceChangeListener.h b/libjava/javax/naming/event/NamespaceChangeListener.h
deleted file mode 100644
index e34f1863241..00000000000
--- a/libjava/javax/naming/event/NamespaceChangeListener.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamespaceChangeListener__
-#define __javax_naming_event_NamespaceChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamespaceChangeListener;
-          class NamingEvent;
-          class NamingExceptionEvent;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamespaceChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void objectAdded(::javax::naming::event::NamingEvent *) = 0;
-  virtual void objectRemoved(::javax::naming::event::NamingEvent *) = 0;
-  virtual void objectRenamed(::javax::naming::event::NamingEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_NamespaceChangeListener__
diff --git a/libjava/javax/naming/event/NamingEvent.h b/libjava/javax/naming/event/NamingEvent.h
deleted file mode 100644
index aad8b0e058d..00000000000
--- a/libjava/javax/naming/event/NamingEvent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingEvent__
-#define __javax_naming_event_NamingEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Binding;
-      namespace event
-      {
-          class EventContext;
-          class NamingEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingEvent : public ::java::util::EventObject
-{
-
-public:
-  NamingEvent(::javax::naming::event::EventContext *, jint, ::javax::naming::Binding *, ::javax::naming::Binding *, ::java::lang::Object *);
-  virtual jint getType();
-  virtual ::javax::naming::event::EventContext * getEventContext();
-  virtual ::javax::naming::Binding * getOldBinding();
-  virtual ::javax::naming::Binding * getNewBinding();
-  virtual ::java::lang::Object * getChangeInfo();
-  virtual void dispatch(::javax::naming::event::NamingListener *);
-private:
-  static const jlong serialVersionUID = -7126752885365133499LL;
-public:
-  static const jint OBJECT_ADDED = 0;
-  static const jint OBJECT_REMOVED = 1;
-  static const jint OBJECT_RENAMED = 2;
-  static const jint OBJECT_CHANGED = 3;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) changeInfo;
-  jint type;
-  ::javax::naming::Binding * oldBinding;
-  ::javax::naming::Binding * newBinding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_event_NamingEvent__
diff --git a/libjava/javax/naming/event/NamingExceptionEvent.h b/libjava/javax/naming/event/NamingExceptionEvent.h
deleted file mode 100644
index 9aee3c513ef..00000000000
--- a/libjava/javax/naming/event/NamingExceptionEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingExceptionEvent__
-#define __javax_naming_event_NamingExceptionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingException;
-      namespace event
-      {
-          class EventContext;
-          class NamingExceptionEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingExceptionEvent : public ::java::util::EventObject
-{
-
-public:
-  NamingExceptionEvent(::javax::naming::event::EventContext *, ::javax::naming::NamingException *);
-  virtual ::javax::naming::NamingException * getException();
-  virtual ::javax::naming::event::EventContext * getEventContext();
-  virtual void dispatch(::javax::naming::event::NamingListener *);
-private:
-  static const jlong serialVersionUID = -4877678086134736336LL;
-  ::javax::naming::NamingException * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_event_NamingExceptionEvent__
diff --git a/libjava/javax/naming/event/NamingListener.h b/libjava/javax/naming/event/NamingListener.h
deleted file mode 100644
index d7eb0034359..00000000000
--- a/libjava/javax/naming/event/NamingListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingListener__
-#define __javax_naming_event_NamingListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingExceptionEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingListener : public ::java::lang::Object
-{
-
-public:
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_NamingListener__
diff --git a/libjava/javax/naming/event/ObjectChangeListener.h b/libjava/javax/naming/event/ObjectChangeListener.h
deleted file mode 100644
index eaff319dfa3..00000000000
--- a/libjava/javax/naming/event/ObjectChangeListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_ObjectChangeListener__
-#define __javax_naming_event_ObjectChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingEvent;
-          class NamingExceptionEvent;
-          class ObjectChangeListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::ObjectChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void objectChanged(::javax::naming::event::NamingEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_ObjectChangeListener__
diff --git a/libjava/javax/naming/ldap/Control.h b/libjava/javax/naming/ldap/Control.h
deleted file mode 100644
index 0a3f9f6a524..00000000000
--- a/libjava/javax/naming/ldap/Control.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_Control__
-#define __javax_naming_ldap_Control__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::Control : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual jboolean isCritical() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  static const jboolean CRITICAL = 1;
-  static const jboolean NONCRITICAL = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_Control__
diff --git a/libjava/javax/naming/ldap/ControlFactory.h b/libjava/javax/naming/ldap/ControlFactory.h
deleted file mode 100644
index 404e22faa66..00000000000
--- a/libjava/javax/naming/ldap/ControlFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ControlFactory__
-#define __javax_naming_ldap_ControlFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace ldap
-      {
-          class Control;
-          class ControlFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ControlFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  ControlFactory();
-public:
-  virtual ::javax::naming::ldap::Control * getControlInstance(::javax::naming::ldap::Control *) = 0;
-  static ::javax::naming::ldap::Control * getControlInstance(::javax::naming::ldap::Control *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_ControlFactory__
diff --git a/libjava/javax/naming/ldap/ExtendedRequest.h b/libjava/javax/naming/ldap/ExtendedRequest.h
deleted file mode 100644
index f97e66b0483..00000000000
--- a/libjava/javax/naming/ldap/ExtendedRequest.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ExtendedRequest__
-#define __javax_naming_ldap_ExtendedRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedRequest;
-          class ExtendedResponse;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ExtendedRequest : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  virtual ::javax::naming::ldap::ExtendedResponse * createExtendedResponse(::java::lang::String *, JArray< jbyte > *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_ExtendedRequest__
diff --git a/libjava/javax/naming/ldap/ExtendedResponse.h b/libjava/javax/naming/ldap/ExtendedResponse.h
deleted file mode 100644
index cb985fec90f..00000000000
--- a/libjava/javax/naming/ldap/ExtendedResponse.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ExtendedResponse__
-#define __javax_naming_ldap_ExtendedResponse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedResponse;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ExtendedResponse : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_ExtendedResponse__
diff --git a/libjava/javax/naming/ldap/HasControls.h b/libjava/javax/naming/ldap/HasControls.h
deleted file mode 100644
index 616b3b9a634..00000000000
--- a/libjava/javax/naming/ldap/HasControls.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_HasControls__
-#define __javax_naming_ldap_HasControls__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-          class HasControls;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::HasControls : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::naming::ldap::Control * > * getControls() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_HasControls__
diff --git a/libjava/javax/naming/ldap/InitialLdapContext.h b/libjava/javax/naming/ldap/InitialLdapContext.h
deleted file mode 100644
index b2511804cbc..00000000000
--- a/libjava/javax/naming/ldap/InitialLdapContext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_InitialLdapContext__
-#define __javax_naming_ldap_InitialLdapContext__
-
-#pragma interface
-
-#include <javax/naming/directory/InitialDirContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-          class ExtendedRequest;
-          class ExtendedResponse;
-          class InitialLdapContext;
-          class LdapContext;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::InitialLdapContext : public ::javax::naming::directory::InitialDirContext
-{
-
-public:
-  InitialLdapContext();
-  InitialLdapContext(::java::util::Hashtable *, JArray< ::javax::naming::ldap::Control * > *);
-private:
-  ::javax::naming::ldap::LdapContext * getDefaultInitLdapCtx();
-public:
-  virtual ::javax::naming::ldap::ExtendedResponse * extendedOperation(::javax::naming::ldap::ExtendedRequest *);
-  virtual JArray< ::javax::naming::ldap::Control * > * getConnectControls();
-  virtual JArray< ::javax::naming::ldap::Control * > * getRequestControls();
-  virtual JArray< ::javax::naming::ldap::Control * > * getResponseControls();
-  virtual ::javax::naming::ldap::LdapContext * newInstance(JArray< ::javax::naming::ldap::Control * > *);
-  virtual void reconnect(JArray< ::javax::naming::ldap::Control * > *);
-  virtual void setRequestControls(JArray< ::javax::naming::ldap::Control * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_InitialLdapContext__
diff --git a/libjava/javax/naming/ldap/LdapContext.h b/libjava/javax/naming/ldap/LdapContext.h
deleted file mode 100644
index 4fa910e72e6..00000000000
--- a/libjava/javax/naming/ldap/LdapContext.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_LdapContext__
-#define __javax_naming_ldap_LdapContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-      namespace ldap
-      {
-          class Control;
-          class ExtendedRequest;
-          class ExtendedResponse;
-          class LdapContext;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::LdapContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::ldap::ExtendedResponse * extendedOperation(::javax::naming::ldap::ExtendedRequest *) = 0;
-  virtual ::javax::naming::ldap::LdapContext * newInstance(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual void reconnect(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getConnectControls() = 0;
-  virtual void setRequestControls(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getRequestControls() = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getResponseControls() = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static ::java::lang::String * CONTROL_FACTORIES;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_LdapContext__
diff --git a/libjava/javax/naming/ldap/LdapReferralException.h b/libjava/javax/naming/ldap/LdapReferralException.h
deleted file mode 100644
index 6ed5618e9c0..00000000000
--- a/libjava/javax/naming/ldap/LdapReferralException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_LdapReferralException__
-#define __javax_naming_ldap_LdapReferralException__
-
-#pragma interface
-
-#include <javax/naming/ReferralException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace ldap
-      {
-          class Control;
-          class LdapReferralException;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::LdapReferralException : public ::javax::naming::ReferralException
-{
-
-public: // actually protected
-  LdapReferralException();
-  LdapReferralException(::java::lang::String *);
-public:
-  virtual ::javax::naming::Context * getReferralContext() = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *) = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *, JArray< ::javax::naming::ldap::Control * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_LdapReferralException__
diff --git a/libjava/javax/naming/ldap/StartTlsRequest.h b/libjava/javax/naming/ldap/StartTlsRequest.h
deleted file mode 100644
index 70ced7e5773..00000000000
--- a/libjava/javax/naming/ldap/StartTlsRequest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_StartTlsRequest__
-#define __javax_naming_ldap_StartTlsRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedResponse;
-          class StartTlsRequest;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::StartTlsRequest : public ::java::lang::Object
-{
-
-public:
-  StartTlsRequest();
-  virtual ::java::lang::String * getID();
-  virtual JArray< jbyte > * getEncodedValue();
-  virtual ::javax::naming::ldap::ExtendedResponse * createExtendedResponse(::java::lang::String *, JArray< jbyte > *, jint, jint);
-private:
-  static const jlong serialVersionUID = 4441679576360753397LL;
-public:
-  static ::java::lang::String * OID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_StartTlsRequest__
diff --git a/libjava/javax/naming/ldap/StartTlsResponse.h b/libjava/javax/naming/ldap/StartTlsResponse.h
deleted file mode 100644
index 9b3d8c59cf6..00000000000
--- a/libjava/javax/naming/ldap/StartTlsResponse.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_StartTlsResponse__
-#define __javax_naming_ldap_StartTlsResponse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class StartTlsResponse;
-      }
-    }
-    namespace net
-    {
-      namespace ssl
-      {
-          class HostnameVerifier;
-          class SSLSession;
-          class SSLSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::StartTlsResponse : public ::java::lang::Object
-{
-
-public: // actually protected
-  StartTlsResponse();
-public:
-  virtual ::java::lang::String * getID();
-  virtual JArray< jbyte > * getEncodedValue();
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual void setHostnameVerifier(::javax::net::ssl::HostnameVerifier *) = 0;
-  virtual ::javax::net::ssl::SSLSession * negotiate() = 0;
-  virtual ::javax::net::ssl::SSLSession * negotiate(::javax::net::ssl::SSLSocketFactory *) = 0;
-  virtual void close() = 0;
-private:
-  static const jlong serialVersionUID = 8372842182579276418LL;
-public:
-  static ::java::lang::String * OID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_StartTlsResponse__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotification.h b/libjava/javax/naming/ldap/UnsolicitedNotification.h
deleted file mode 100644
index c23d4b0f2f6..00000000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotification.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotification__
-#define __javax_naming_ldap_UnsolicitedNotification__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingException;
-      namespace ldap
-      {
-          class Control;
-          class UnsolicitedNotification;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotification : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * getReferrals() = 0;
-  virtual ::javax::naming::NamingException * getException() = 0;
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getControls() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_UnsolicitedNotification__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h b/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h
deleted file mode 100644
index b6e4a4f5648..00000000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotificationEvent__
-#define __javax_naming_ldap_UnsolicitedNotificationEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class UnsolicitedNotification;
-          class UnsolicitedNotificationEvent;
-          class UnsolicitedNotificationListener;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotificationEvent : public ::java::util::EventObject
-{
-
-public:
-  UnsolicitedNotificationEvent(::java::lang::Object *, ::javax::naming::ldap::UnsolicitedNotification *);
-  virtual ::javax::naming::ldap::UnsolicitedNotification * getNotification();
-  virtual void dispatch(::javax::naming::ldap::UnsolicitedNotificationListener *);
-private:
-  static const jlong serialVersionUID = -2382603380799883705LL;
-  ::javax::naming::ldap::UnsolicitedNotification * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) notice;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_UnsolicitedNotificationEvent__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h b/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h
deleted file mode 100644
index d389381ac36..00000000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotificationListener__
-#define __javax_naming_ldap_UnsolicitedNotificationListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingExceptionEvent;
-      }
-      namespace ldap
-      {
-          class UnsolicitedNotificationEvent;
-          class UnsolicitedNotificationListener;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotificationListener : public ::java::lang::Object
-{
-
-public:
-  virtual void notificationReceived(::javax::naming::ldap::UnsolicitedNotificationEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_UnsolicitedNotificationListener__
diff --git a/libjava/javax/naming/spi/DirObjectFactory.h b/libjava/javax/naming/spi/DirObjectFactory.h
deleted file mode 100644
index d84d3181c96..00000000000
--- a/libjava/javax/naming/spi/DirObjectFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirObjectFactory__
-#define __javax_naming_spi_DirObjectFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirObjectFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_DirObjectFactory__
diff --git a/libjava/javax/naming/spi/DirStateFactory$Result.h b/libjava/javax/naming/spi/DirStateFactory$Result.h
deleted file mode 100644
index 586c7d3bc67..00000000000
--- a/libjava/javax/naming/spi/DirStateFactory$Result.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirStateFactory$Result__
-#define __javax_naming_spi_DirStateFactory$Result__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirStateFactory$Result;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirStateFactory$Result : public ::java::lang::Object
-{
-
-public:
-  DirStateFactory$Result(::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual ::java::lang::Object * getObject();
-  virtual ::javax::naming::directory::Attributes * getAttributes();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) obj;
-  ::javax::naming::directory::Attributes * outAttrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_DirStateFactory$Result__
diff --git a/libjava/javax/naming/spi/DirStateFactory.h b/libjava/javax/naming/spi/DirStateFactory.h
deleted file mode 100644
index 02b2b5a84bc..00000000000
--- a/libjava/javax/naming/spi/DirStateFactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirStateFactory__
-#define __javax_naming_spi_DirStateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirStateFactory;
-          class DirStateFactory$Result;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirStateFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::DirStateFactory$Result * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_DirStateFactory__
diff --git a/libjava/javax/naming/spi/DirectoryManager.h b/libjava/javax/naming/spi/DirectoryManager.h
deleted file mode 100644
index 32d015c1da2..00000000000
--- a/libjava/javax/naming/spi/DirectoryManager.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirectoryManager__
-#define __javax_naming_spi_DirectoryManager__
-
-#pragma interface
-
-#include <javax/naming/spi/NamingManager.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-      }
-      namespace spi
-      {
-          class DirStateFactory$Result;
-          class DirectoryManager;
-          class ObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirectoryManager : public ::javax::naming::spi::NamingManager
-{
-
-public: // actually package-private
-  DirectoryManager();
-public:
-  static ::javax::naming::directory::DirContext * getContinuationDirContext(::javax::naming::CannotProceedException *);
-private:
-  static ::java::lang::Object * tryCreateObject(::javax::naming::spi::ObjectFactory *, ::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-public:
-  static ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-  static ::javax::naming::spi::DirStateFactory$Result * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_DirectoryManager__
diff --git a/libjava/javax/naming/spi/InitialContextFactory.h b/libjava/javax/naming/spi/InitialContextFactory.h
deleted file mode 100644
index 446876cf2ee..00000000000
--- a/libjava/javax/naming/spi/InitialContextFactory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_InitialContextFactory__
-#define __javax_naming_spi_InitialContextFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace spi
-      {
-          class InitialContextFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::InitialContextFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Context * getInitialContext(::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_InitialContextFactory__
diff --git a/libjava/javax/naming/spi/InitialContextFactoryBuilder.h b/libjava/javax/naming/spi/InitialContextFactoryBuilder.h
deleted file mode 100644
index bdd016036e9..00000000000
--- a/libjava/javax/naming/spi/InitialContextFactoryBuilder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_InitialContextFactoryBuilder__
-#define __javax_naming_spi_InitialContextFactoryBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace spi
-      {
-          class InitialContextFactory;
-          class InitialContextFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::InitialContextFactoryBuilder : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::InitialContextFactory * createInitialContextFactory(::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_InitialContextFactoryBuilder__
diff --git a/libjava/javax/naming/spi/NamingManager.h b/libjava/javax/naming/spi/NamingManager.h
deleted file mode 100644
index 6a24048edde..00000000000
--- a/libjava/javax/naming/spi/NamingManager.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_NamingManager__
-#define __javax_naming_spi_NamingManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class InitialContextFactoryBuilder;
-          class NamingManager;
-          class ObjectFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::NamingManager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NamingManager();
-public:
-  static jboolean hasInitialContextFactoryBuilder();
-  static ::javax::naming::Context * getInitialContext(::java::util::Hashtable *);
-public: // actually package-private
-  static ::javax::naming::Context * getURLContext(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::lang::String *, ::java::util::Hashtable *);
-  static ::java::lang::Class * forName(::java::lang::String *);
-public:
-  static ::javax::naming::Context * getURLContext(::java::lang::String *, ::java::util::Hashtable *);
-  static void setObjectFactoryBuilder(::javax::naming::spi::ObjectFactoryBuilder *);
-public: // actually package-private
-  static ::java::util::StringTokenizer * getPlusPath(::java::lang::String *, ::java::util::Hashtable *, ::javax::naming::Context *);
-public:
-  static ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static void setInitialContextFactoryBuilder(::javax::naming::spi::InitialContextFactoryBuilder *);
-  static ::javax::naming::Context * getContinuationContext(::javax::naming::CannotProceedException *);
-  static ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static ::java::lang::String * CPE;
-private:
-  static ::javax::naming::spi::InitialContextFactoryBuilder * icfb;
-public: // actually package-private
-  static ::javax::naming::spi::ObjectFactoryBuilder * ofb;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_NamingManager__
diff --git a/libjava/javax/naming/spi/ObjectFactory.h b/libjava/javax/naming/spi/ObjectFactory.h
deleted file mode 100644
index 62d563969af..00000000000
--- a/libjava/javax/naming/spi/ObjectFactory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ObjectFactory__
-#define __javax_naming_spi_ObjectFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class ObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ObjectFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_ObjectFactory__
diff --git a/libjava/javax/naming/spi/ObjectFactoryBuilder.h b/libjava/javax/naming/spi/ObjectFactoryBuilder.h
deleted file mode 100644
index eb457e4fb8f..00000000000
--- a/libjava/javax/naming/spi/ObjectFactoryBuilder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ObjectFactoryBuilder__
-#define __javax_naming_spi_ObjectFactoryBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace spi
-      {
-          class ObjectFactory;
-          class ObjectFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ObjectFactoryBuilder : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::ObjectFactory * createObjectFactory(::java::lang::Object *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_ObjectFactoryBuilder__
diff --git a/libjava/javax/naming/spi/ResolveResult.h b/libjava/javax/naming/spi/ResolveResult.h
deleted file mode 100644
index 72f118748c8..00000000000
--- a/libjava/javax/naming/spi/ResolveResult.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ResolveResult__
-#define __javax_naming_spi_ResolveResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-      namespace spi
-      {
-          class ResolveResult;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ResolveResult : public ::java::lang::Object
-{
-
-public: // actually protected
-  ResolveResult();
-public:
-  ResolveResult(::java::lang::Object *, ::java::lang::String *);
-  ResolveResult(::java::lang::Object *, ::javax::naming::Name *);
-  virtual ::javax::naming::Name * getRemainingName();
-  virtual ::java::lang::Object * getResolvedObj();
-  virtual void setRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingComponent(::java::lang::String *);
-  virtual void setResolvedObj(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -4552108072002407559LL;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) resolvedObj;
-  ::javax::naming::Name * remainingName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_ResolveResult__
diff --git a/libjava/javax/naming/spi/Resolver.h b/libjava/javax/naming/spi/Resolver.h
deleted file mode 100644
index bc7956d712a..00000000000
--- a/libjava/javax/naming/spi/Resolver.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_Resolver__
-#define __javax_naming_spi_Resolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-      namespace spi
-      {
-          class ResolveResult;
-          class Resolver;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::Resolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::ResolveResult * resolveToClass(::javax::naming::Name *, ::java::lang::Class *) = 0;
-  virtual ::javax::naming::spi::ResolveResult * resolveToClass(::java::lang::String *, ::java::lang::Class *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_Resolver__
diff --git a/libjava/javax/naming/spi/StateFactory.h b/libjava/javax/naming/spi/StateFactory.h
deleted file mode 100644
index 2039a27e2de..00000000000
--- a/libjava/javax/naming/spi/StateFactory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_StateFactory__
-#define __javax_naming_spi_StateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class StateFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::StateFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_StateFactory__
diff --git a/libjava/javax/net/ServerSocketFactory.h b/libjava/javax/net/ServerSocketFactory.h
deleted file mode 100644
index 51a57097aad..00000000000
--- a/libjava/javax/net/ServerSocketFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ServerSocketFactory__
-#define __javax_net_ServerSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class ServerSocket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class ServerSocketFactory;
-    }
-  }
-}
-
-class javax::net::ServerSocketFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  ServerSocketFactory();
-public:
-  static ::javax::net::ServerSocketFactory * getDefault();
-  virtual ::java::net::ServerSocket * createServerSocket();
-  virtual ::java::net::ServerSocket * createServerSocket(jint) = 0;
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint) = 0;
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ServerSocketFactory__
diff --git a/libjava/javax/net/SocketFactory.h b/libjava/javax/net/SocketFactory.h
deleted file mode 100644
index 2e7821c2d09..00000000000
--- a/libjava/javax/net/SocketFactory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_SocketFactory__
-#define __javax_net_SocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class SocketFactory;
-    }
-  }
-}
-
-class javax::net::SocketFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  SocketFactory();
-public:
-  static ::javax::net::SocketFactory * getDefault();
-  virtual ::java::net::Socket * createSocket();
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint) = 0;
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint) = 0;
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint) = 0;
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_SocketFactory__
diff --git a/libjava/javax/net/VanillaServerSocketFactory.h b/libjava/javax/net/VanillaServerSocketFactory.h
deleted file mode 100644
index 1c6f7dc4841..00000000000
--- a/libjava/javax/net/VanillaServerSocketFactory.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_VanillaServerSocketFactory__
-#define __javax_net_VanillaServerSocketFactory__
-
-#pragma interface
-
-#include <javax/net/ServerSocketFactory.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class ServerSocket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class VanillaServerSocketFactory;
-    }
-  }
-}
-
-class javax::net::VanillaServerSocketFactory : public ::javax::net::ServerSocketFactory
-{
-
-public: // actually package-private
-  VanillaServerSocketFactory();
-public:
-  virtual ::java::net::ServerSocket * createServerSocket();
-  virtual ::java::net::ServerSocket * createServerSocket(jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_VanillaServerSocketFactory__
diff --git a/libjava/javax/net/VanillaSocketFactory.h b/libjava/javax/net/VanillaSocketFactory.h
deleted file mode 100644
index cca82bd7cfe..00000000000
--- a/libjava/javax/net/VanillaSocketFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_VanillaSocketFactory__
-#define __javax_net_VanillaSocketFactory__
-
-#pragma interface
-
-#include <javax/net/SocketFactory.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class VanillaSocketFactory;
-    }
-  }
-}
-
-class javax::net::VanillaSocketFactory : public ::javax::net::SocketFactory
-{
-
-public: // actually package-private
-  VanillaSocketFactory();
-public:
-  virtual ::java::net::Socket * createSocket();
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint);
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_VanillaSocketFactory__
diff --git a/libjava/javax/net/ssl/CertPathTrustManagerParameters.h b/libjava/javax/net/ssl/CertPathTrustManagerParameters.h
deleted file mode 100644
index 7f7cd67a0b2..00000000000
--- a/libjava/javax/net/ssl/CertPathTrustManagerParameters.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_CertPathTrustManagerParameters__
-#define __javax_net_ssl_CertPathTrustManagerParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathParameters;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class CertPathTrustManagerParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::CertPathTrustManagerParameters : public ::java::lang::Object
-{
-
-public:
-  CertPathTrustManagerParameters(::java::security::cert::CertPathParameters *);
-  virtual ::java::security::cert::CertPathParameters * getParameters();
-private:
-  ::java::security::cert::CertPathParameters * __attribute__((aligned(__alignof__( ::java::lang::Object)))) params;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_CertPathTrustManagerParameters__
diff --git a/libjava/javax/net/ssl/HandshakeCompletedEvent.h b/libjava/javax/net/ssl/HandshakeCompletedEvent.h
deleted file mode 100644
index a9c15479aa1..00000000000
--- a/libjava/javax/net/ssl/HandshakeCompletedEvent.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_HandshakeCompletedEvent__
-#define __javax_net_ssl_HandshakeCompletedEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedEvent;
-          class SSLSession;
-          class SSLSocket;
-      }
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::HandshakeCompletedEvent : public ::java::util::EventObject
-{
-
-public:
-  HandshakeCompletedEvent(::javax::net::ssl::SSLSocket *, ::javax::net::ssl::SSLSession *);
-  virtual ::java::lang::String * getCipherSuite();
-  virtual JArray< ::java::security::cert::Certificate * > * getLocalCertificates();
-  virtual ::java::security::Principal * getLocalPrincipal();
-  virtual JArray< ::java::security::cert::Certificate * > * getPeerCertificates();
-  virtual JArray< ::javax::security::cert::X509Certificate * > * getPeerCertificateChain();
-  virtual ::java::security::Principal * getPeerPrincipal();
-  virtual ::javax::net::ssl::SSLSession * getSession();
-  virtual ::javax::net::ssl::SSLSocket * getSocket();
-private:
-  static const jlong serialVersionUID = 7914963744257769778LL;
-  ::javax::net::ssl::SSLSession * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) session;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_HandshakeCompletedEvent__
diff --git a/libjava/javax/net/ssl/HandshakeCompletedListener.h b/libjava/javax/net/ssl/HandshakeCompletedListener.h
deleted file mode 100644
index 7a797bd4eb0..00000000000
--- a/libjava/javax/net/ssl/HandshakeCompletedListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_HandshakeCompletedListener__
-#define __javax_net_ssl_HandshakeCompletedListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedEvent;
-          class HandshakeCompletedListener;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::HandshakeCompletedListener : public ::java::lang::Object
-{
-
-public:
-  virtual void handshakeCompleted(::javax::net::ssl::HandshakeCompletedEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_HandshakeCompletedListener__
diff --git a/libjava/javax/net/ssl/HostnameVerifier.h b/libjava/javax/net/ssl/HostnameVerifier.h
deleted file mode 100644
index 34a6ff01c0b..00000000000
--- a/libjava/javax/net/ssl/HostnameVerifier.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_HostnameVerifier__
-#define __javax_net_ssl_HostnameVerifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HostnameVerifier;
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::HostnameVerifier : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean verify(::java::lang::String *, ::javax::net::ssl::SSLSession *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_HostnameVerifier__
diff --git a/libjava/javax/net/ssl/HttpsURLConnection.h b/libjava/javax/net/ssl/HttpsURLConnection.h
deleted file mode 100644
index 3f016541938..00000000000
--- a/libjava/javax/net/ssl/HttpsURLConnection.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_HttpsURLConnection__
-#define __javax_net_ssl_HttpsURLConnection__
-
-#pragma interface
-
-#include <java/net/HttpURLConnection.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HostnameVerifier;
-          class HttpsURLConnection;
-          class SSLSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::HttpsURLConnection : public ::java::net::HttpURLConnection
-{
-
-public: // actually protected
-  HttpsURLConnection(::java::net::URL *);
-public:
-  static ::javax::net::ssl::HostnameVerifier * getDefaultHostnameVerifier();
-  static void setDefaultHostnameVerifier(::javax::net::ssl::HostnameVerifier *);
-  static ::javax::net::ssl::SSLSocketFactory * getDefaultSSLSocketFactory();
-  static void setDefaultSSLSocketFactory(::javax::net::ssl::SSLSocketFactory *);
-  virtual ::javax::net::ssl::HostnameVerifier * getHostnameVerifier();
-  virtual void setHostnameVerifier(::javax::net::ssl::HostnameVerifier *);
-  virtual ::javax::net::ssl::SSLSocketFactory * getSSLSocketFactory();
-  virtual void setSSLSocketFactory(::javax::net::ssl::SSLSocketFactory *);
-  virtual ::java::security::Principal * getLocalPrincipal();
-  virtual ::java::security::Principal * getPeerPrincipal();
-  virtual ::java::lang::String * getCipherSuite() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getLocalCertificates() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getServerCertificates() = 0;
-private:
-  static ::javax::net::ssl::HostnameVerifier * defaultVerifier;
-  static ::javax::net::ssl::SSLSocketFactory * defaultFactory;
-public: // actually protected
-  ::javax::net::ssl::HostnameVerifier * __attribute__((aligned(__alignof__( ::java::net::HttpURLConnection)))) hostnameVerifier;
-private:
-  ::javax::net::ssl::SSLSocketFactory * factory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_HttpsURLConnection__
diff --git a/libjava/javax/net/ssl/KeyManager.h b/libjava/javax/net/ssl/KeyManager.h
deleted file mode 100644
index 80b3c76006c..00000000000
--- a/libjava/javax/net/ssl/KeyManager.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyManager__
-#define __javax_net_ssl_KeyManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyManager : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_KeyManager__
diff --git a/libjava/javax/net/ssl/KeyManagerFactory$1.h b/libjava/javax/net/ssl/KeyManagerFactory$1.h
deleted file mode 100644
index 600509de5b6..00000000000
--- a/libjava/javax/net/ssl/KeyManagerFactory$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyManagerFactory$1__
-#define __javax_net_ssl_KeyManagerFactory$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManagerFactory$1;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyManagerFactory$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  KeyManagerFactory$1();
-public:
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_KeyManagerFactory$1__
diff --git a/libjava/javax/net/ssl/KeyManagerFactory.h b/libjava/javax/net/ssl/KeyManagerFactory.h
deleted file mode 100644
index 72685063158..00000000000
--- a/libjava/javax/net/ssl/KeyManagerFactory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyManagerFactory__
-#define __javax_net_ssl_KeyManagerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-        class Provider;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class KeyManagerFactory;
-          class KeyManagerFactorySpi;
-          class ManagerFactoryParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyManagerFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyManagerFactory(::javax::net::ssl::KeyManagerFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::lang::String * getDefaultAlgorithm();
-  static ::javax::net::ssl::KeyManagerFactory * getInstance(::java::lang::String *);
-  static ::javax::net::ssl::KeyManagerFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::net::ssl::KeyManagerFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< ::javax::net::ssl::KeyManager * > * getKeyManagers();
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::javax::net::ssl::ManagerFactoryParameters *);
-  virtual void init(::java::security::KeyStore *, JArray< jchar > *);
-private:
-  static ::java::lang::String * KEY_MANAGER_FACTORY;
-  static ::java::lang::String * DEFAULT_ALGORITHM;
-  ::javax::net::ssl::KeyManagerFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kmfSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_KeyManagerFactory__
diff --git a/libjava/javax/net/ssl/KeyManagerFactorySpi.h b/libjava/javax/net/ssl/KeyManagerFactorySpi.h
deleted file mode 100644
index 4b82525697a..00000000000
--- a/libjava/javax/net/ssl/KeyManagerFactorySpi.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyManagerFactorySpi__
-#define __javax_net_ssl_KeyManagerFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class KeyManagerFactorySpi;
-          class ManagerFactoryParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyManagerFactorySpi : public ::java::lang::Object
-{
-
-public:
-  KeyManagerFactorySpi();
-public: // actually protected
-  virtual JArray< ::javax::net::ssl::KeyManager * > * engineGetKeyManagers() = 0;
-  virtual void engineInit(::javax::net::ssl::ManagerFactoryParameters *) = 0;
-  virtual void engineInit(::java::security::KeyStore *, JArray< jchar > *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_KeyManagerFactorySpi__
diff --git a/libjava/javax/net/ssl/KeyStoreBuilderParameters.h b/libjava/javax/net/ssl/KeyStoreBuilderParameters.h
deleted file mode 100644
index da1ada28635..00000000000
--- a/libjava/javax/net/ssl/KeyStoreBuilderParameters.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyStoreBuilderParameters__
-#define __javax_net_ssl_KeyStoreBuilderParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyStoreBuilderParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyStoreBuilderParameters : public ::java::lang::Object
-{
-
-public:
-  KeyStoreBuilderParameters();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_KeyStoreBuilderParameters__
diff --git a/libjava/javax/net/ssl/ManagerFactoryParameters.h b/libjava/javax/net/ssl/ManagerFactoryParameters.h
deleted file mode 100644
index e78e6e5d46a..00000000000
--- a/libjava/javax/net/ssl/ManagerFactoryParameters.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_ManagerFactoryParameters__
-#define __javax_net_ssl_ManagerFactoryParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class ManagerFactoryParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::ManagerFactoryParameters : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_ManagerFactoryParameters__
diff --git a/libjava/javax/net/ssl/SSLContext.h b/libjava/javax/net/ssl/SSLContext.h
deleted file mode 100644
index 43be1bc99e2..00000000000
--- a/libjava/javax/net/ssl/SSLContext.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLContext__
-#define __javax_net_ssl_SSLContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class SSLContext;
-          class SSLContextSpi;
-          class SSLEngine;
-          class SSLServerSocketFactory;
-          class SSLSessionContext;
-          class SSLSocketFactory;
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLContext : public ::java::lang::Object
-{
-
-public: // actually protected
-  SSLContext(::javax::net::ssl::SSLContextSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::net::ssl::SSLContext * getInstance(::java::lang::String *);
-  static ::javax::net::ssl::SSLContext * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::net::ssl::SSLContext * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::javax::net::ssl::SSLEngine * createSSLEngine();
-  virtual ::javax::net::ssl::SSLEngine * createSSLEngine(::java::lang::String *, jint);
-  virtual ::javax::net::ssl::SSLSessionContext * getClientSessionContext();
-  virtual ::java::lang::String * getProtocol();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::javax::net::ssl::SSLSessionContext * getServerSessionContext();
-  virtual ::javax::net::ssl::SSLServerSocketFactory * getServerSocketFactory();
-  virtual ::javax::net::ssl::SSLSocketFactory * getSocketFactory();
-  virtual void init(JArray< ::javax::net::ssl::KeyManager * > *, JArray< ::javax::net::ssl::TrustManager * > *, ::java::security::SecureRandom *);
-private:
-  static ::java::lang::String * SSL_CONTEXT;
-  ::javax::net::ssl::SSLContextSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ctxSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * protocol;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLContext__
diff --git a/libjava/javax/net/ssl/SSLContextSpi.h b/libjava/javax/net/ssl/SSLContextSpi.h
deleted file mode 100644
index 618b0157b46..00000000000
--- a/libjava/javax/net/ssl/SSLContextSpi.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLContextSpi__
-#define __javax_net_ssl_SSLContextSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class SSLContextSpi;
-          class SSLEngine;
-          class SSLServerSocketFactory;
-          class SSLSessionContext;
-          class SSLSocketFactory;
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLContextSpi : public ::java::lang::Object
-{
-
-public:
-  SSLContextSpi();
-public: // actually protected
-  virtual ::javax::net::ssl::SSLEngine * engineCreateSSLEngine() = 0;
-  virtual ::javax::net::ssl::SSLEngine * engineCreateSSLEngine(::java::lang::String *, jint) = 0;
-  virtual ::javax::net::ssl::SSLSessionContext * engineGetClientSessionContext() = 0;
-  virtual ::javax::net::ssl::SSLSessionContext * engineGetServerSessionContext() = 0;
-  virtual ::javax::net::ssl::SSLServerSocketFactory * engineGetServerSocketFactory() = 0;
-  virtual ::javax::net::ssl::SSLSocketFactory * engineGetSocketFactory() = 0;
-  virtual void engineInit(JArray< ::javax::net::ssl::KeyManager * > *, JArray< ::javax::net::ssl::TrustManager * > *, ::java::security::SecureRandom *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLContextSpi__
diff --git a/libjava/javax/net/ssl/SSLEngine.h b/libjava/javax/net/ssl/SSLEngine.h
deleted file mode 100644
index 7bbe1b9c5a9..00000000000
--- a/libjava/javax/net/ssl/SSLEngine.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLEngine__
-#define __javax_net_ssl_SSLEngine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngine;
-          class SSLEngineResult;
-          class SSLEngineResult$HandshakeStatus;
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLEngine : public ::java::lang::Object
-{
-
-public: // actually protected
-  SSLEngine();
-  SSLEngine(::java::lang::String *, jint);
-public:
-  virtual void beginHandshake() = 0;
-  virtual void closeInbound() = 0;
-  virtual void closeOutbound() = 0;
-  virtual ::java::lang::Runnable * getDelegatedTask() = 0;
-  virtual ::java::lang::String * getPeerHost();
-  virtual jint getPeerPort();
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols() = 0;
-  virtual jboolean getEnableSessionCreation() = 0;
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * getHandshakeStatus() = 0;
-  virtual jboolean getNeedClientAuth() = 0;
-  virtual ::javax::net::ssl::SSLSession * getSession() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols() = 0;
-  virtual jboolean getUseClientMode() = 0;
-  virtual jboolean getWantClientAuth() = 0;
-  virtual jboolean isInboundDone() = 0;
-  virtual jboolean isOutboundDone() = 0;
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *) = 0;
-  virtual void setEnableSessionCreation(jboolean) = 0;
-  virtual void setUseClientMode(jboolean) = 0;
-  virtual void setNeedClientAuth(jboolean) = 0;
-  virtual void setWantClientAuth(jboolean) = 0;
-  virtual ::javax::net::ssl::SSLEngineResult * unwrap(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual ::javax::net::ssl::SSLEngineResult * unwrap(::java::nio::ByteBuffer *, JArray< ::java::nio::ByteBuffer * > *);
-  virtual ::javax::net::ssl::SSLEngineResult * unwrap(::java::nio::ByteBuffer *, JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual ::javax::net::ssl::SSLEngineResult * wrap(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual ::javax::net::ssl::SSLEngineResult * wrap(JArray< ::java::nio::ByteBuffer * > *, ::java::nio::ByteBuffer *);
-  virtual ::javax::net::ssl::SSLEngineResult * wrap(JArray< ::java::nio::ByteBuffer * > *, jint, jint, ::java::nio::ByteBuffer *) = 0;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) peerHost;
-  jint peerPort;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLEngine__
diff --git a/libjava/javax/net/ssl/SSLEngineResult$HandshakeStatus.h b/libjava/javax/net/ssl/SSLEngineResult$HandshakeStatus.h
deleted file mode 100644
index 8fa544db565..00000000000
--- a/libjava/javax/net/ssl/SSLEngineResult$HandshakeStatus.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLEngineResult$HandshakeStatus__
-#define __javax_net_ssl_SSLEngineResult$HandshakeStatus__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult$HandshakeStatus;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLEngineResult$HandshakeStatus : public ::java::lang::Enum
-{
-
-  SSLEngineResult$HandshakeStatus(::java::lang::String *, jint);
-public:
-  static JArray< ::javax::net::ssl::SSLEngineResult$HandshakeStatus * > * values();
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * valueOf(::java::lang::String *);
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * NOT_HANDSHAKING;
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * FINISHED;
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * NEED_TASK;
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * NEED_WRAP;
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * NEED_UNWRAP;
-private:
-  static JArray< ::javax::net::ssl::SSLEngineResult$HandshakeStatus * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLEngineResult$HandshakeStatus__
diff --git a/libjava/javax/net/ssl/SSLEngineResult$Status.h b/libjava/javax/net/ssl/SSLEngineResult$Status.h
deleted file mode 100644
index 925e3d5e8d7..00000000000
--- a/libjava/javax/net/ssl/SSLEngineResult$Status.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLEngineResult$Status__
-#define __javax_net_ssl_SSLEngineResult$Status__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult$Status;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLEngineResult$Status : public ::java::lang::Enum
-{
-
-  SSLEngineResult$Status(::java::lang::String *, jint);
-public:
-  static JArray< ::javax::net::ssl::SSLEngineResult$Status * > * values();
-  static ::javax::net::ssl::SSLEngineResult$Status * valueOf(::java::lang::String *);
-  static ::javax::net::ssl::SSLEngineResult$Status * BUFFER_UNDERFLOW;
-  static ::javax::net::ssl::SSLEngineResult$Status * BUFFER_OVERFLOW;
-  static ::javax::net::ssl::SSLEngineResult$Status * OK;
-  static ::javax::net::ssl::SSLEngineResult$Status * CLOSED;
-private:
-  static JArray< ::javax::net::ssl::SSLEngineResult$Status * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLEngineResult$Status__
diff --git a/libjava/javax/net/ssl/SSLEngineResult.h b/libjava/javax/net/ssl/SSLEngineResult.h
deleted file mode 100644
index c88f3e4f895..00000000000
--- a/libjava/javax/net/ssl/SSLEngineResult.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLEngineResult__
-#define __javax_net_ssl_SSLEngineResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult;
-          class SSLEngineResult$HandshakeStatus;
-          class SSLEngineResult$Status;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLEngineResult : public ::java::lang::Object
-{
-
-public:
-  SSLEngineResult(::javax::net::ssl::SSLEngineResult$Status *, ::javax::net::ssl::SSLEngineResult$HandshakeStatus *, jint, jint);
-  virtual jint bytesConsumed();
-  virtual jint bytesProduced();
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * getHandshakeStatus();
-  virtual ::javax::net::ssl::SSLEngineResult$Status * getStatus();
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::net::ssl::SSLEngineResult$HandshakeStatus * __attribute__((aligned(__alignof__( ::java::lang::Object)))) handshakeStatus;
-  ::javax::net::ssl::SSLEngineResult$Status * status;
-  jint bytesConsumed__;
-  jint bytesProduced__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLEngineResult__
diff --git a/libjava/javax/net/ssl/SSLException.h b/libjava/javax/net/ssl/SSLException.h
deleted file mode 100644
index 7364cb101ab..00000000000
--- a/libjava/javax/net/ssl/SSLException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLException__
-#define __javax_net_ssl_SSLException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLException : public ::java::io::IOException
-{
-
-public:
-  SSLException(::java::lang::String *);
-  SSLException(::java::lang::String *, ::java::lang::Throwable *);
-  SSLException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 4511006460650708967LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLException__
diff --git a/libjava/javax/net/ssl/SSLHandshakeException.h b/libjava/javax/net/ssl/SSLHandshakeException.h
deleted file mode 100644
index 0894667b978..00000000000
--- a/libjava/javax/net/ssl/SSLHandshakeException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLHandshakeException__
-#define __javax_net_ssl_SSLHandshakeException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLHandshakeException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLHandshakeException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SSLHandshakeException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLHandshakeException__
diff --git a/libjava/javax/net/ssl/SSLKeyException.h b/libjava/javax/net/ssl/SSLKeyException.h
deleted file mode 100644
index 4a6d8b69dd1..00000000000
--- a/libjava/javax/net/ssl/SSLKeyException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLKeyException__
-#define __javax_net_ssl_SSLKeyException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLKeyException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLKeyException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SSLKeyException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLKeyException__
diff --git a/libjava/javax/net/ssl/SSLPeerUnverifiedException.h b/libjava/javax/net/ssl/SSLPeerUnverifiedException.h
deleted file mode 100644
index d5085f1ff59..00000000000
--- a/libjava/javax/net/ssl/SSLPeerUnverifiedException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLPeerUnverifiedException__
-#define __javax_net_ssl_SSLPeerUnverifiedException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLPeerUnverifiedException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLPeerUnverifiedException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SSLPeerUnverifiedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLPeerUnverifiedException__
diff --git a/libjava/javax/net/ssl/SSLPermission.h b/libjava/javax/net/ssl/SSLPermission.h
deleted file mode 100644
index 32ccc233ffc..00000000000
--- a/libjava/javax/net/ssl/SSLPermission.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLPermission__
-#define __javax_net_ssl_SSLPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLPermission;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLPermission : public ::java::security::BasicPermission
-{
-
-public:
-  SSLPermission(::java::lang::String *);
-  SSLPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3456898025505876775LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLPermission__
diff --git a/libjava/javax/net/ssl/SSLProtocolException.h b/libjava/javax/net/ssl/SSLProtocolException.h
deleted file mode 100644
index afe38494ee0..00000000000
--- a/libjava/javax/net/ssl/SSLProtocolException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLProtocolException__
-#define __javax_net_ssl_SSLProtocolException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLProtocolException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLProtocolException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SSLProtocolException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLProtocolException__
diff --git a/libjava/javax/net/ssl/SSLServerSocket.h b/libjava/javax/net/ssl/SSLServerSocket.h
deleted file mode 100644
index e47aa9e2ad7..00000000000
--- a/libjava/javax/net/ssl/SSLServerSocket.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLServerSocket__
-#define __javax_net_ssl_SSLServerSocket__
-
-#pragma interface
-
-#include <java/net/ServerSocket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLServerSocket;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLServerSocket : public ::java::net::ServerSocket
-{
-
-public: // actually protected
-  SSLServerSocket();
-  SSLServerSocket(jint);
-  SSLServerSocket(jint, jint);
-  SSLServerSocket(jint, jint, ::java::net::InetAddress *);
-public:
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites() = 0;
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols() = 0;
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean getEnableSessionCreation() = 0;
-  virtual void setEnableSessionCreation(jboolean) = 0;
-  virtual jboolean getNeedClientAuth() = 0;
-  virtual void setNeedClientAuth(jboolean) = 0;
-  virtual jboolean getUseClientMode() = 0;
-  virtual void setUseClientMode(jboolean) = 0;
-  virtual jboolean getWantClientAuth() = 0;
-  virtual void setWantClientAuth(jboolean) = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLServerSocket__
diff --git a/libjava/javax/net/ssl/SSLServerSocketFactory$ErrorServerSocketFactory.h b/libjava/javax/net/ssl/SSLServerSocketFactory$ErrorServerSocketFactory.h
deleted file mode 100644
index a21a8dd7463..00000000000
--- a/libjava/javax/net/ssl/SSLServerSocketFactory$ErrorServerSocketFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLServerSocketFactory$ErrorServerSocketFactory__
-#define __javax_net_ssl_SSLServerSocketFactory$ErrorServerSocketFactory__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLServerSocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class ServerSocket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLServerSocketFactory$ErrorServerSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLServerSocketFactory$ErrorServerSocketFactory : public ::javax::net::ssl::SSLServerSocketFactory
-{
-
-public: // actually package-private
-  SSLServerSocketFactory$ErrorServerSocketFactory(::java::lang::RuntimeException *);
-public:
-  ::java::net::ServerSocket * createServerSocket();
-  ::java::net::ServerSocket * createServerSocket(jint);
-  ::java::net::ServerSocket * createServerSocket(jint, jint);
-  ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *);
-  JArray< ::java::lang::String * > * getDefaultCipherSuites();
-  JArray< ::java::lang::String * > * getSupportedCipherSuites();
-private:
-  ::java::lang::RuntimeException * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocketFactory)))) x;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLServerSocketFactory$ErrorServerSocketFactory__
diff --git a/libjava/javax/net/ssl/SSLServerSocketFactory.h b/libjava/javax/net/ssl/SSLServerSocketFactory.h
deleted file mode 100644
index cffb2fbd788..00000000000
--- a/libjava/javax/net/ssl/SSLServerSocketFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLServerSocketFactory__
-#define __javax_net_ssl_SSLServerSocketFactory__
-
-#pragma interface
-
-#include <javax/net/ServerSocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-        class ServerSocketFactory;
-      namespace ssl
-      {
-          class SSLContext;
-          class SSLServerSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLServerSocketFactory : public ::javax::net::ServerSocketFactory
-{
-
-public: // actually protected
-  SSLServerSocketFactory();
-public:
-  static ::javax::net::ServerSocketFactory * getDefault();
-  virtual JArray< ::java::lang::String * > * getDefaultCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-private:
-  static ::javax::net::ssl::SSLContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLServerSocketFactory__
diff --git a/libjava/javax/net/ssl/SSLSession.h b/libjava/javax/net/ssl/SSLSession.h
deleted file mode 100644
index ade9a0e309d..00000000000
--- a/libjava/javax/net/ssl/SSLSession.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSession__
-#define __javax_net_ssl_SSLSession__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-          class SSLSessionContext;
-      }
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSession : public ::java::lang::Object
-{
-
-public:
-  virtual jint getApplicationBufferSize() = 0;
-  virtual ::java::lang::String * getCipherSuite() = 0;
-  virtual jlong getCreationTime() = 0;
-  virtual JArray< jbyte > * getId() = 0;
-  virtual jlong getLastAccessedTime() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getLocalCertificates() = 0;
-  virtual ::java::security::Principal * getLocalPrincipal() = 0;
-  virtual jint getPacketBufferSize() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getPeerCertificates() = 0;
-  virtual JArray< ::javax::security::cert::X509Certificate * > * getPeerCertificateChain() = 0;
-  virtual ::java::lang::String * getPeerHost() = 0;
-  virtual jint getPeerPort() = 0;
-  virtual ::java::security::Principal * getPeerPrincipal() = 0;
-  virtual ::java::lang::String * getProtocol() = 0;
-  virtual ::javax::net::ssl::SSLSessionContext * getSessionContext() = 0;
-  virtual JArray< ::java::lang::String * > * getValueNames() = 0;
-  virtual ::java::lang::Object * getValue(::java::lang::String *) = 0;
-  virtual void invalidate() = 0;
-  virtual jboolean isValid() = 0;
-  virtual void putValue(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void removeValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_SSLSession__
diff --git a/libjava/javax/net/ssl/SSLSessionBindingEvent.h b/libjava/javax/net/ssl/SSLSessionBindingEvent.h
deleted file mode 100644
index b8b62315132..00000000000
--- a/libjava/javax/net/ssl/SSLSessionBindingEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSessionBindingEvent__
-#define __javax_net_ssl_SSLSessionBindingEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-          class SSLSessionBindingEvent;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSessionBindingEvent : public ::java::util::EventObject
-{
-
-public:
-  SSLSessionBindingEvent(::javax::net::ssl::SSLSession *, ::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::net::ssl::SSLSession * getSession();
-private:
-  static const jlong serialVersionUID = 3989172637106345LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLSessionBindingEvent__
diff --git a/libjava/javax/net/ssl/SSLSessionBindingListener.h b/libjava/javax/net/ssl/SSLSessionBindingListener.h
deleted file mode 100644
index 442b749f3ff..00000000000
--- a/libjava/javax/net/ssl/SSLSessionBindingListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSessionBindingListener__
-#define __javax_net_ssl_SSLSessionBindingListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSessionBindingEvent;
-          class SSLSessionBindingListener;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSessionBindingListener : public ::java::lang::Object
-{
-
-public:
-  virtual void valueBound(::javax::net::ssl::SSLSessionBindingEvent *) = 0;
-  virtual void valueUnbound(::javax::net::ssl::SSLSessionBindingEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_SSLSessionBindingListener__
diff --git a/libjava/javax/net/ssl/SSLSessionContext.h b/libjava/javax/net/ssl/SSLSessionContext.h
deleted file mode 100644
index ec20fb6a67c..00000000000
--- a/libjava/javax/net/ssl/SSLSessionContext.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSessionContext__
-#define __javax_net_ssl_SSLSessionContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-          class SSLSessionContext;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSessionContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Enumeration * getIds() = 0;
-  virtual ::javax::net::ssl::SSLSession * getSession(JArray< jbyte > *) = 0;
-  virtual jint getSessionCacheSize() = 0;
-  virtual jint getSessionTimeout() = 0;
-  virtual void setSessionCacheSize(jint) = 0;
-  virtual void setSessionTimeout(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_SSLSessionContext__
diff --git a/libjava/javax/net/ssl/SSLSocket.h b/libjava/javax/net/ssl/SSLSocket.h
deleted file mode 100644
index 061bfe15ef0..00000000000
--- a/libjava/javax/net/ssl/SSLSocket.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSocket__
-#define __javax_net_ssl_SSLSocket__
-
-#pragma interface
-
-#include <java/net/Socket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedListener;
-          class SSLSession;
-          class SSLSocket;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSocket : public ::java::net::Socket
-{
-
-public: // actually protected
-  SSLSocket();
-  SSLSocket(::java::lang::String *, jint);
-  SSLSocket(::java::net::InetAddress *, jint);
-  SSLSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  SSLSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-public:
-  virtual void addHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *) = 0;
-  virtual void removeHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *) = 0;
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites() = 0;
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols() = 0;
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean getEnableSessionCreation() = 0;
-  virtual void setEnableSessionCreation(jboolean) = 0;
-  virtual jboolean getNeedClientAuth() = 0;
-  virtual void setNeedClientAuth(jboolean) = 0;
-  virtual ::javax::net::ssl::SSLSession * getSession() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols() = 0;
-  virtual jboolean getUseClientMode() = 0;
-  virtual void setUseClientMode(jboolean) = 0;
-  virtual jboolean getWantClientAuth() = 0;
-  virtual void setWantClientAuth(jboolean) = 0;
-  virtual void startHandshake() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLSocket__
diff --git a/libjava/javax/net/ssl/SSLSocketFactory$ErrorSocketFactory.h b/libjava/javax/net/ssl/SSLSocketFactory$ErrorSocketFactory.h
deleted file mode 100644
index df6eab75d7e..00000000000
--- a/libjava/javax/net/ssl/SSLSocketFactory$ErrorSocketFactory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSocketFactory$ErrorSocketFactory__
-#define __javax_net_ssl_SSLSocketFactory$ErrorSocketFactory__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLSocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSocketFactory$ErrorSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSocketFactory$ErrorSocketFactory : public ::javax::net::ssl::SSLSocketFactory
-{
-
-public: // actually package-private
-  SSLSocketFactory$ErrorSocketFactory(::java::lang::RuntimeException *);
-public:
-  ::java::net::Socket * createSocket();
-  ::java::net::Socket * createSocket(::java::lang::String *, jint);
-  ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  ::java::net::Socket * createSocket(::java::net::InetAddress *, jint);
-  ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-  JArray< ::java::lang::String * > * getDefaultCipherSuites();
-  JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  ::java::net::Socket * createSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean);
-private:
-  ::java::lang::RuntimeException * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLSocketFactory)))) x;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLSocketFactory$ErrorSocketFactory__
diff --git a/libjava/javax/net/ssl/SSLSocketFactory.h b/libjava/javax/net/ssl/SSLSocketFactory.h
deleted file mode 100644
index 624a97ab6a6..00000000000
--- a/libjava/javax/net/ssl/SSLSocketFactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSocketFactory__
-#define __javax_net_ssl_SSLSocketFactory__
-
-#pragma interface
-
-#include <javax/net/SocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class SocketFactory;
-      namespace ssl
-      {
-          class SSLContext;
-          class SSLSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSocketFactory : public ::javax::net::SocketFactory
-{
-
-public:
-  SSLSocketFactory();
-  static ::javax::net::SocketFactory * getDefault();
-  virtual ::java::net::Socket * createSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean) = 0;
-  virtual JArray< ::java::lang::String * > * getDefaultCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-private:
-  static ::javax::net::ssl::SSLContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLSocketFactory__
diff --git a/libjava/javax/net/ssl/TrivialHostnameVerifier.h b/libjava/javax/net/ssl/TrivialHostnameVerifier.h
deleted file mode 100644
index e360858239d..00000000000
--- a/libjava/javax/net/ssl/TrivialHostnameVerifier.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrivialHostnameVerifier__
-#define __javax_net_ssl_TrivialHostnameVerifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-          class TrivialHostnameVerifier;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrivialHostnameVerifier : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TrivialHostnameVerifier();
-public:
-  virtual jboolean verify(::java::lang::String *, ::javax::net::ssl::SSLSession *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_TrivialHostnameVerifier__
diff --git a/libjava/javax/net/ssl/TrustManager.h b/libjava/javax/net/ssl/TrustManager.h
deleted file mode 100644
index 3ef89b7b79a..00000000000
--- a/libjava/javax/net/ssl/TrustManager.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrustManager__
-#define __javax_net_ssl_TrustManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrustManager : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_TrustManager__
diff --git a/libjava/javax/net/ssl/TrustManagerFactory$1.h b/libjava/javax/net/ssl/TrustManagerFactory$1.h
deleted file mode 100644
index 526d7ee907d..00000000000
--- a/libjava/javax/net/ssl/TrustManagerFactory$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrustManagerFactory$1__
-#define __javax_net_ssl_TrustManagerFactory$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class TrustManagerFactory$1;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrustManagerFactory$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TrustManagerFactory$1();
-public:
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_TrustManagerFactory$1__
diff --git a/libjava/javax/net/ssl/TrustManagerFactory.h b/libjava/javax/net/ssl/TrustManagerFactory.h
deleted file mode 100644
index 2d87597c199..00000000000
--- a/libjava/javax/net/ssl/TrustManagerFactory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrustManagerFactory__
-#define __javax_net_ssl_TrustManagerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-        class Provider;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class ManagerFactoryParameters;
-          class TrustManager;
-          class TrustManagerFactory;
-          class TrustManagerFactorySpi;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrustManagerFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  TrustManagerFactory(::javax::net::ssl::TrustManagerFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::net::ssl::TrustManagerFactory * getInstance(::java::lang::String *);
-  static ::javax::net::ssl::TrustManagerFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::net::ssl::TrustManagerFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  static ::java::lang::String * getDefaultAlgorithm();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual JArray< ::javax::net::ssl::TrustManager * > * getTrustManagers();
-  virtual void init(::javax::net::ssl::ManagerFactoryParameters *);
-  virtual void init(::java::security::KeyStore *);
-private:
-  static ::java::lang::String * TRUST_MANAGER_FACTORY;
-  static ::java::lang::String * DEFAULT_ALGORITHM;
-  ::javax::net::ssl::TrustManagerFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tmfSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_TrustManagerFactory__
diff --git a/libjava/javax/net/ssl/TrustManagerFactorySpi.h b/libjava/javax/net/ssl/TrustManagerFactorySpi.h
deleted file mode 100644
index 3c1343d74a8..00000000000
--- a/libjava/javax/net/ssl/TrustManagerFactorySpi.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrustManagerFactorySpi__
-#define __javax_net_ssl_TrustManagerFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class ManagerFactoryParameters;
-          class TrustManager;
-          class TrustManagerFactorySpi;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrustManagerFactorySpi : public ::java::lang::Object
-{
-
-public:
-  TrustManagerFactorySpi();
-public: // actually protected
-  virtual JArray< ::javax::net::ssl::TrustManager * > * engineGetTrustManagers() = 0;
-  virtual void engineInit(::javax::net::ssl::ManagerFactoryParameters *) = 0;
-  virtual void engineInit(::java::security::KeyStore *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_TrustManagerFactorySpi__
diff --git a/libjava/javax/net/ssl/X509ExtendedKeyManager.h b/libjava/javax/net/ssl/X509ExtendedKeyManager.h
deleted file mode 100644
index cb3b68c3a0c..00000000000
--- a/libjava/javax/net/ssl/X509ExtendedKeyManager.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_X509ExtendedKeyManager__
-#define __javax_net_ssl_X509ExtendedKeyManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-    namespace security
-    {
-        class Principal;
-        class PrivateKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngine;
-          class X509ExtendedKeyManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::X509ExtendedKeyManager : public ::java::lang::Object
-{
-
-public: // actually protected
-  X509ExtendedKeyManager();
-public:
-  virtual ::java::lang::String * chooseEngineClientAlias(JArray< ::java::lang::String * > *, JArray< ::java::security::Principal * > *, ::javax::net::ssl::SSLEngine *);
-  virtual ::java::lang::String * chooseEngineServerAlias(::java::lang::String *, JArray< ::java::security::Principal * > *, ::javax::net::ssl::SSLEngine *);
-  virtual ::java::lang::String * chooseClientAlias(JArray< ::java::lang::String * > *, JArray< ::java::security::Principal * > *, ::java::net::Socket *) = 0;
-  virtual ::java::lang::String * chooseServerAlias(::java::lang::String *, JArray< ::java::security::Principal * > *, ::java::net::Socket *) = 0;
-  virtual JArray< ::java::security::cert::X509Certificate * > * getCertificateChain(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getClientAliases(::java::lang::String *, JArray< ::java::security::Principal * > *) = 0;
-  virtual ::java::security::PrivateKey * getPrivateKey(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getServerAliases(::java::lang::String *, JArray< ::java::security::Principal * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_X509ExtendedKeyManager__
diff --git a/libjava/javax/net/ssl/X509KeyManager.h b/libjava/javax/net/ssl/X509KeyManager.h
deleted file mode 100644
index 9ce4f14c433..00000000000
--- a/libjava/javax/net/ssl/X509KeyManager.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_X509KeyManager__
-#define __javax_net_ssl_X509KeyManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-    namespace security
-    {
-        class Principal;
-        class PrivateKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class X509KeyManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::X509KeyManager : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * chooseClientAlias(JArray< ::java::lang::String * > *, JArray< ::java::security::Principal * > *, ::java::net::Socket *) = 0;
-  virtual ::java::lang::String * chooseServerAlias(::java::lang::String *, JArray< ::java::security::Principal * > *, ::java::net::Socket *) = 0;
-  virtual JArray< ::java::security::cert::X509Certificate * > * getCertificateChain(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getClientAliases(::java::lang::String *, JArray< ::java::security::Principal * > *) = 0;
-  virtual ::java::security::PrivateKey * getPrivateKey(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getServerAliases(::java::lang::String *, JArray< ::java::security::Principal * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_X509KeyManager__
diff --git a/libjava/javax/net/ssl/X509TrustManager.h b/libjava/javax/net/ssl/X509TrustManager.h
deleted file mode 100644
index 4afd47e09a8..00000000000
--- a/libjava/javax/net/ssl/X509TrustManager.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_X509TrustManager__
-#define __javax_net_ssl_X509TrustManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class X509TrustManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::X509TrustManager : public ::java::lang::Object
-{
-
-public:
-  virtual void checkClientTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *) = 0;
-  virtual void checkServerTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::security::cert::X509Certificate * > * getAcceptedIssuers() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_X509TrustManager__
diff --git a/libjava/javax/print/AttributeException.h b/libjava/javax/print/AttributeException.h
deleted file mode 100644
index 2402a177205..00000000000
--- a/libjava/javax/print/AttributeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_AttributeException__
-#define __javax_print_AttributeException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class AttributeException;
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class javax::print::AttributeException : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Class * > * getUnsupportedAttributes() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * getUnsupportedValues() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_AttributeException__
diff --git a/libjava/javax/print/CancelablePrintJob.h b/libjava/javax/print/CancelablePrintJob.h
deleted file mode 100644
index 31b006e9551..00000000000
--- a/libjava/javax/print/CancelablePrintJob.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_CancelablePrintJob__
-#define __javax_print_CancelablePrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class CancelablePrintJob;
-        class Doc;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::CancelablePrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void cancel() = 0;
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_CancelablePrintJob__
diff --git a/libjava/javax/print/Doc.h b/libjava/javax/print/Doc.h
deleted file mode 100644
index 6b3bc34c354..00000000000
--- a/libjava/javax/print/Doc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_Doc__
-#define __javax_print_Doc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class DocFlavor;
-      namespace attribute
-      {
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::Doc : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::attribute::DocAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::DocFlavor * getDocFlavor() = 0;
-  virtual ::java::lang::Object * getPrintData() = 0;
-  virtual ::java::io::Reader * getReaderForText() = 0;
-  virtual ::java::io::InputStream * getStreamForBytes() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_Doc__
diff --git a/libjava/javax/print/DocFlavor$BYTE_ARRAY.h b/libjava/javax/print/DocFlavor$BYTE_ARRAY.h
deleted file mode 100644
index 006ddb000e0..00000000000
--- a/libjava/javax/print/DocFlavor$BYTE_ARRAY.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$BYTE_ARRAY__
-#define __javax_print_DocFlavor$BYTE_ARRAY__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$BYTE_ARRAY;
-    }
-  }
-}
-
-class javax::print::DocFlavor$BYTE_ARRAY : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$BYTE_ARRAY(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9065578006593857475LL;
-public:
-  static ::javax::print::DocFlavor$BYTE_ARRAY * AUTOSENSE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * GIF;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * JPEG;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PCL;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PDF;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PNG;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * POSTSCRIPT;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$BYTE_ARRAY__
diff --git a/libjava/javax/print/DocFlavor$CHAR_ARRAY.h b/libjava/javax/print/DocFlavor$CHAR_ARRAY.h
deleted file mode 100644
index 1909d2e151a..00000000000
--- a/libjava/javax/print/DocFlavor$CHAR_ARRAY.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$CHAR_ARRAY__
-#define __javax_print_DocFlavor$CHAR_ARRAY__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$CHAR_ARRAY;
-    }
-  }
-}
-
-class javax::print::DocFlavor$CHAR_ARRAY : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$CHAR_ARRAY(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8720590903724405128LL;
-public:
-  static ::javax::print::DocFlavor$CHAR_ARRAY * TEXT_HTML;
-  static ::javax::print::DocFlavor$CHAR_ARRAY * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$CHAR_ARRAY__
diff --git a/libjava/javax/print/DocFlavor$INPUT_STREAM.h b/libjava/javax/print/DocFlavor$INPUT_STREAM.h
deleted file mode 100644
index 3c635deed2b..00000000000
--- a/libjava/javax/print/DocFlavor$INPUT_STREAM.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$INPUT_STREAM__
-#define __javax_print_DocFlavor$INPUT_STREAM__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$INPUT_STREAM;
-    }
-  }
-}
-
-class javax::print::DocFlavor$INPUT_STREAM : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$INPUT_STREAM(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7045842700749194127LL;
-public:
-  static ::javax::print::DocFlavor$INPUT_STREAM * AUTOSENSE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * GIF;
-  static ::javax::print::DocFlavor$INPUT_STREAM * JPEG;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PCL;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PDF;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PNG;
-  static ::javax::print::DocFlavor$INPUT_STREAM * POSTSCRIPT;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$INPUT_STREAM__
diff --git a/libjava/javax/print/DocFlavor$READER.h b/libjava/javax/print/DocFlavor$READER.h
deleted file mode 100644
index c6a24cd62f0..00000000000
--- a/libjava/javax/print/DocFlavor$READER.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$READER__
-#define __javax_print_DocFlavor$READER__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$READER;
-    }
-  }
-}
-
-class javax::print::DocFlavor$READER : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$READER(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7100295812579351567LL;
-public:
-  static ::javax::print::DocFlavor$READER * TEXT_HTML;
-  static ::javax::print::DocFlavor$READER * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$READER__
diff --git a/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h b/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h
deleted file mode 100644
index 85386b18d8d..00000000000
--- a/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$SERVICE_FORMATTED__
-#define __javax_print_DocFlavor$SERVICE_FORMATTED__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$SERVICE_FORMATTED;
-    }
-  }
-}
-
-class javax::print::DocFlavor$SERVICE_FORMATTED : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$SERVICE_FORMATTED(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6181337766266637256LL;
-public:
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * PAGEABLE;
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * PRINTABLE;
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * RENDERABLE_IMAGE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$SERVICE_FORMATTED__
diff --git a/libjava/javax/print/DocFlavor$STRING.h b/libjava/javax/print/DocFlavor$STRING.h
deleted file mode 100644
index c1ef38bbd84..00000000000
--- a/libjava/javax/print/DocFlavor$STRING.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$STRING__
-#define __javax_print_DocFlavor$STRING__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$STRING;
-    }
-  }
-}
-
-class javax::print::DocFlavor$STRING : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$STRING(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4414407504887034035LL;
-public:
-  static ::javax::print::DocFlavor$STRING * TEXT_HTML;
-  static ::javax::print::DocFlavor$STRING * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$STRING__
diff --git a/libjava/javax/print/DocFlavor$URL.h b/libjava/javax/print/DocFlavor$URL.h
deleted file mode 100644
index 82bc8569ab3..00000000000
--- a/libjava/javax/print/DocFlavor$URL.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$URL__
-#define __javax_print_DocFlavor$URL__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$URL;
-    }
-  }
-}
-
-class javax::print::DocFlavor$URL : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$URL(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2936725788144902062LL;
-public:
-  static ::javax::print::DocFlavor$URL * AUTOSENSE;
-  static ::javax::print::DocFlavor$URL * GIF;
-  static ::javax::print::DocFlavor$URL * JPEG;
-  static ::javax::print::DocFlavor$URL * PCL;
-  static ::javax::print::DocFlavor$URL * PDF;
-  static ::javax::print::DocFlavor$URL * PNG;
-  static ::javax::print::DocFlavor$URL * POSTSCRIPT;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$URL__
diff --git a/libjava/javax/print/DocFlavor.h b/libjava/javax/print/DocFlavor.h
deleted file mode 100644
index f5331984a28..00000000000
--- a/libjava/javax/print/DocFlavor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor__
-#define __javax_print_DocFlavor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-    }
-  }
-}
-
-class javax::print::DocFlavor : public ::java::lang::Object
-{
-
-public:
-  DocFlavor(::java::lang::String *, ::java::lang::String *);
-private:
-  void parseMimeType(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getMediaSubtype();
-  virtual ::java::lang::String * getMediaType();
-  virtual ::java::lang::String * getMimeType();
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual ::java::lang::String * getRepresentationClassName();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -4512080796965449721LL;
-public:
-  static ::java::lang::String * hostEncoding;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mediaSubtype;
-  ::java::lang::String * mediaType;
-  ::java::util::TreeMap * params;
-  ::java::lang::String * myClassName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor__
diff --git a/libjava/javax/print/DocPrintJob.h b/libjava/javax/print/DocPrintJob.h
deleted file mode 100644
index 3a450e180d0..00000000000
--- a/libjava/javax/print/DocPrintJob.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocPrintJob__
-#define __javax_print_DocPrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class DocPrintJob;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::DocPrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_DocPrintJob__
diff --git a/libjava/javax/print/FlavorException.h b/libjava/javax/print/FlavorException.h
deleted file mode 100644
index b06cdd63332..00000000000
--- a/libjava/javax/print/FlavorException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_FlavorException__
-#define __javax_print_FlavorException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class FlavorException;
-    }
-  }
-}
-
-class javax::print::FlavorException : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::print::DocFlavor * > * getUnsupportedFlavors() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_FlavorException__
diff --git a/libjava/javax/print/MultiDoc.h b/libjava/javax/print/MultiDoc.h
deleted file mode 100644
index 8148c7e5f52..00000000000
--- a/libjava/javax/print/MultiDoc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDoc__
-#define __javax_print_MultiDoc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class MultiDoc;
-    }
-  }
-}
-
-class javax::print::MultiDoc : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::Doc * getDoc() = 0;
-  virtual ::javax::print::MultiDoc * next() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDoc__
diff --git a/libjava/javax/print/MultiDocPrintJob.h b/libjava/javax/print/MultiDocPrintJob.h
deleted file mode 100644
index 4c14d64634d..00000000000
--- a/libjava/javax/print/MultiDocPrintJob.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDocPrintJob__
-#define __javax_print_MultiDocPrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class MultiDoc;
-        class MultiDocPrintJob;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::MultiDocPrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void print(::javax::print::MultiDoc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDocPrintJob__
diff --git a/libjava/javax/print/MultiDocPrintService.h b/libjava/javax/print/MultiDocPrintService.h
deleted file mode 100644
index 0b613f64a0b..00000000000
--- a/libjava/javax/print/MultiDocPrintService.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDocPrintService__
-#define __javax_print_MultiDocPrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class MultiDocPrintJob;
-        class MultiDocPrintService;
-        class ServiceUIFactory;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::MultiDocPrintService : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::MultiDocPrintJob * createMultiDocPrintJob() = 0;
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDocPrintService__
diff --git a/libjava/javax/print/PrintException.h b/libjava/javax/print/PrintException.h
deleted file mode 100644
index 90a1659acb8..00000000000
--- a/libjava/javax/print/PrintException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintException__
-#define __javax_print_PrintException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class PrintException;
-    }
-  }
-}
-
-class javax::print::PrintException : public ::java::lang::Exception
-{
-
-public:
-  PrintException();
-  PrintException(::java::lang::Exception *);
-  PrintException(::java::lang::String *);
-  PrintException(::java::lang::String *, ::java::lang::Exception *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_PrintException__
diff --git a/libjava/javax/print/PrintService.h b/libjava/javax/print/PrintService.h
deleted file mode 100644
index 3e26159a1ca..00000000000
--- a/libjava/javax/print/PrintService.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintService__
-#define __javax_print_PrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class PrintService;
-        class ServiceUIFactory;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::PrintService : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_PrintService__
diff --git a/libjava/javax/print/PrintServiceLookup.h b/libjava/javax/print/PrintServiceLookup.h
deleted file mode 100644
index 5409da90d94..00000000000
--- a/libjava/javax/print/PrintServiceLookup.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintServiceLookup__
-#define __javax_print_PrintServiceLookup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class CupsPrintServiceLookup;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class MultiDocPrintService;
-        class PrintService;
-        class PrintServiceLookup;
-      namespace attribute
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::PrintServiceLookup : public ::java::lang::Object
-{
-
-public:
-  PrintServiceLookup();
-  static jboolean registerServiceProvider(::javax::print::PrintServiceLookup *);
-  static jboolean registerService(::javax::print::PrintService *);
-  static JArray< ::javax::print::PrintService * > * lookupPrintServices(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *);
-  static JArray< ::javax::print::MultiDocPrintService * > * lookupMultiDocPrintServices(JArray< ::javax::print::DocFlavor * > *, ::javax::print::attribute::AttributeSet *);
-  static ::javax::print::PrintService * lookupDefaultPrintService();
-  virtual ::javax::print::PrintService * getDefaultPrintService() = 0;
-  virtual JArray< ::javax::print::MultiDocPrintService * > * getMultiDocPrintServices(JArray< ::javax::print::DocFlavor * > *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::PrintService * > * getPrintServices() = 0;
-  virtual JArray< ::javax::print::PrintService * > * getPrintServices(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-private:
-  static ::gnu::javax::print::CupsPrintServiceLookup * systemProvider;
-  static ::java::util::HashSet * printServices;
-  static ::java::util::HashSet * printServiceLookups;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_PrintServiceLookup__
diff --git a/libjava/javax/print/ServiceUI.h b/libjava/javax/print/ServiceUI.h
deleted file mode 100644
index 8ec373ac49b..00000000000
--- a/libjava/javax/print/ServiceUI.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_ServiceUI__
-#define __javax_print_ServiceUI__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class PrintService;
-        class ServiceUI;
-      namespace attribute
-      {
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::ServiceUI : public ::java::lang::Object
-{
-
-public:
-  ServiceUI();
-  static ::javax::print::PrintService * printDialog(::java::awt::GraphicsConfiguration *, jint, jint, JArray< ::javax::print::PrintService * > *, ::javax::print::PrintService *, ::javax::print::DocFlavor *, ::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_ServiceUI__
diff --git a/libjava/javax/print/ServiceUIFactory.h b/libjava/javax/print/ServiceUIFactory.h
deleted file mode 100644
index 2424058fa35..00000000000
--- a/libjava/javax/print/ServiceUIFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_ServiceUIFactory__
-#define __javax_print_ServiceUIFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class ServiceUIFactory;
-    }
-  }
-}
-
-class javax::print::ServiceUIFactory : public ::java::lang::Object
-{
-
-public:
-  ServiceUIFactory();
-  virtual ::java::lang::Object * getUI(jint, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getUIClassNamesForRole(jint) = 0;
-  static const jint ABOUT_UIROLE = 1;
-  static const jint ADMIN_UIROLE = 2;
-  static const jint MAIN_UIROLE = 3;
-  static const jint RESERVED_UIROLE = 99;
-  static ::java::lang::String * DIALOG_UI;
-  static ::java::lang::String * JCOMPONENT_UI;
-  static ::java::lang::String * JDIALOG_UI;
-  static ::java::lang::String * PANEL_UI;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_ServiceUIFactory__
diff --git a/libjava/javax/print/SimpleDoc.h b/libjava/javax/print/SimpleDoc.h
deleted file mode 100644
index b055e4ed9bd..00000000000
--- a/libjava/javax/print/SimpleDoc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_SimpleDoc__
-#define __javax_print_SimpleDoc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class SimpleDoc;
-      namespace attribute
-      {
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::SimpleDoc : public ::java::lang::Object
-{
-
-public:
-  SimpleDoc(::java::lang::Object *, ::javax::print::DocFlavor *, ::javax::print::attribute::DocAttributeSet *);
-  ::javax::print::attribute::DocAttributeSet * getAttributes();
-  ::javax::print::DocFlavor * getDocFlavor();
-  ::java::lang::Object * getPrintData();
-  ::java::io::Reader * getReaderForText();
-  ::java::io::InputStream * getStreamForBytes();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) printData;
-  ::javax::print::DocFlavor * flavor;
-  ::javax::print::attribute::DocAttributeSet * attributes;
-  ::java::io::InputStream * stream;
-  ::java::io::Reader * reader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_SimpleDoc__
diff --git a/libjava/javax/print/StreamPrintService.h b/libjava/javax/print/StreamPrintService.h
deleted file mode 100644
index 115d6efab54..00000000000
--- a/libjava/javax/print/StreamPrintService.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_StreamPrintService__
-#define __javax_print_StreamPrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class ServiceUIFactory;
-        class StreamPrintService;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::StreamPrintService : public ::java::lang::Object
-{
-
-public: // actually protected
-  StreamPrintService(::java::io::OutputStream *);
-public:
-  virtual void dispose();
-  virtual ::java::lang::String * getOutputFormat() = 0;
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual jboolean isDisposed();
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) disposed;
-  ::java::io::OutputStream * out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_StreamPrintService__
diff --git a/libjava/javax/print/StreamPrintServiceFactory.h b/libjava/javax/print/StreamPrintServiceFactory.h
deleted file mode 100644
index 496b51f6189..00000000000
--- a/libjava/javax/print/StreamPrintServiceFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_StreamPrintServiceFactory__
-#define __javax_print_StreamPrintServiceFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class StreamPrintService;
-        class StreamPrintServiceFactory;
-    }
-  }
-}
-
-class javax::print::StreamPrintServiceFactory : public ::java::lang::Object
-{
-
-public:
-  StreamPrintServiceFactory();
-  static JArray< ::javax::print::StreamPrintServiceFactory * > * lookupStreamPrintServiceFactories(::javax::print::DocFlavor *, ::java::lang::String *);
-  virtual ::java::lang::String * getOutputFormat() = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::StreamPrintService * getPrintService(::java::io::OutputStream *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_StreamPrintServiceFactory__
diff --git a/libjava/javax/print/URIException.h b/libjava/javax/print/URIException.h
deleted file mode 100644
index 7e4f868b07f..00000000000
--- a/libjava/javax/print/URIException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_URIException__
-#define __javax_print_URIException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class URIException;
-    }
-  }
-}
-
-class javax::print::URIException : public ::java::lang::Object
-{
-
-public:
-  virtual jint getReason() = 0;
-  virtual ::java::net::URI * getUnsupportedURI() = 0;
-  static const jint URIInaccessible = 1;
-  static const jint URIOtherProblem = -1;
-  static const jint URISchemeNotSupported = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_URIException__
diff --git a/libjava/javax/print/attribute/Attribute.h b/libjava/javax/print/attribute/Attribute.h
deleted file mode 100644
index 88c4efd316e..00000000000
--- a/libjava/javax/print/attribute/Attribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_Attribute__
-#define __javax_print_attribute_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::Attribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_Attribute__
diff --git a/libjava/javax/print/attribute/AttributeSet.h b/libjava/javax/print/attribute/AttributeSet.h
deleted file mode 100644
index f1fed93203e..00000000000
--- a/libjava/javax/print/attribute/AttributeSet.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSet__
-#define __javax_print_attribute_AttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_AttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h
deleted file mode 100644
index 34cee3d0710..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities$SynchronizedAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet : public ::java::lang::Object
-{
-
-public:
-  AttributeSetUtilities$SynchronizedAttributeSet(::javax::print::attribute::AttributeSet *);
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  ::javax::print::attribute::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h
deleted file mode 100644
index 1e2b9a466b7..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedDocAttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedDocAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h
deleted file mode 100644
index c52b5512578..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintJobAttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintJobAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h
deleted file mode 100644
index 4fbb3d9b14d..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintRequestAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintRequestAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h
deleted file mode 100644
index 8177161f282..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintServiceAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintServiceAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h
deleted file mode 100644
index 71de4168464..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities$UnmodifiableAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet : public ::java::lang::Object
-{
-
-public:
-  AttributeSetUtilities$UnmodifiableAttributeSet(::javax::print::attribute::AttributeSet *);
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  ::javax::print::attribute::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h
deleted file mode 100644
index de2bb982c0c..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiableDocAttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiableDocAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiableDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h
deleted file mode 100644
index 6f800a2332b..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintJobAttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintJobAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h
deleted file mode 100644
index 6dea83bd064..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h
deleted file mode 100644
index edfe0690cb6..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities.h b/libjava/javax/print/attribute/AttributeSetUtilities.h
deleted file mode 100644
index 85f90d0681c..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities__
-#define __javax_print_attribute_AttributeSetUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities;
-          class DocAttributeSet;
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities : public ::java::lang::Object
-{
-
-  AttributeSetUtilities();
-public:
-  static ::javax::print::attribute::AttributeSet * synchronizedView(::javax::print::attribute::AttributeSet *);
-  static ::javax::print::attribute::DocAttributeSet * synchronizedView(::javax::print::attribute::DocAttributeSet *);
-  static ::javax::print::attribute::PrintJobAttributeSet * synchronizedView(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::javax::print::attribute::PrintRequestAttributeSet * synchronizedView(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::javax::print::attribute::PrintServiceAttributeSet * synchronizedView(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::javax::print::attribute::AttributeSet * unmodifiableView(::javax::print::attribute::AttributeSet *);
-  static ::javax::print::attribute::DocAttributeSet * unmodifiableView(::javax::print::attribute::DocAttributeSet *);
-  static ::javax::print::attribute::PrintJobAttributeSet * unmodifiableView(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::javax::print::attribute::PrintRequestAttributeSet * unmodifiableView(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::javax::print::attribute::PrintServiceAttributeSet * unmodifiableView(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class * verifyAttributeCategory(::java::lang::Object *, ::java::lang::Class *);
-  static ::javax::print::attribute::Attribute * verifyAttributeValue(::java::lang::Object *, ::java::lang::Class *);
-  static void verifyCategoryForValue(::java::lang::Class *, ::javax::print::attribute::Attribute *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities__
diff --git a/libjava/javax/print/attribute/DateTimeSyntax.h b/libjava/javax/print/attribute/DateTimeSyntax.h
deleted file mode 100644
index 8ec4f3c9812..00000000000
--- a/libjava/javax/print/attribute/DateTimeSyntax.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DateTimeSyntax__
-#define __javax_print_attribute_DateTimeSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DateTimeSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DateTimeSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  DateTimeSyntax(::java::util::Date *);
-public:
-  virtual ::java::util::Date * getValue();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1400819079791208582LL;
-  ::java::util::Date * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_DateTimeSyntax__
diff --git a/libjava/javax/print/attribute/DocAttribute.h b/libjava/javax/print/attribute/DocAttribute.h
deleted file mode 100644
index d26bc6d8c10..00000000000
--- a/libjava/javax/print/attribute/DocAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DocAttribute__
-#define __javax_print_attribute_DocAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DocAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DocAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_DocAttribute__
diff --git a/libjava/javax/print/attribute/DocAttributeSet.h b/libjava/javax/print/attribute/DocAttributeSet.h
deleted file mode 100644
index c85d799c414..00000000000
--- a/libjava/javax/print/attribute/DocAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DocAttributeSet__
-#define __javax_print_attribute_DocAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DocAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_DocAttributeSet__
diff --git a/libjava/javax/print/attribute/EnumSyntax.h b/libjava/javax/print/attribute/EnumSyntax.h
deleted file mode 100644
index 5b445c301b0..00000000000
--- a/libjava/javax/print/attribute/EnumSyntax.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_EnumSyntax__
-#define __javax_print_attribute_EnumSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::EnumSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  EnumSyntax(jint);
-public:
-  virtual jint getValue();
-  virtual ::java::lang::Object * clone();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual ::java::lang::Object * readResolve();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -2739521845085831642LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_EnumSyntax__
diff --git a/libjava/javax/print/attribute/HashAttributeSet.h b/libjava/javax/print/attribute/HashAttributeSet.h
deleted file mode 100644
index b82db6e5759..00000000000
--- a/libjava/javax/print/attribute/HashAttributeSet.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashAttributeSet__
-#define __javax_print_attribute_HashAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class HashAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashAttributeSet : public ::java::lang::Object
-{
-
-public:
-  HashAttributeSet();
-  HashAttributeSet(::javax::print::attribute::Attribute *);
-  HashAttributeSet(JArray< ::javax::print::attribute::Attribute * > *);
-  HashAttributeSet(::javax::print::attribute::AttributeSet *);
-public: // actually protected
-  HashAttributeSet(::java::lang::Class *);
-  HashAttributeSet(::javax::print::attribute::Attribute *, ::java::lang::Class *);
-  HashAttributeSet(JArray< ::javax::print::attribute::Attribute * > *, ::java::lang::Class *);
-  HashAttributeSet(::javax::print::attribute::AttributeSet *, ::java::lang::Class *);
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-private:
-  jboolean addInternal(::javax::print::attribute::Attribute *, ::java::lang::Class *);
-public:
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-private:
-  jboolean addAllInternal(::javax::print::attribute::AttributeSet *, ::java::lang::Class *);
-public:
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 5311560590283707917LL;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) myInterface;
-  ::java::util::HashMap * attributeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashAttributeSet__
diff --git a/libjava/javax/print/attribute/HashDocAttributeSet.h b/libjava/javax/print/attribute/HashDocAttributeSet.h
deleted file mode 100644
index 43b9eaec69b..00000000000
--- a/libjava/javax/print/attribute/HashDocAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashDocAttributeSet__
-#define __javax_print_attribute_HashDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DocAttribute;
-          class DocAttributeSet;
-          class HashDocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashDocAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashDocAttributeSet();
-  HashDocAttributeSet(::javax::print::attribute::DocAttribute *);
-  HashDocAttributeSet(JArray< ::javax::print::attribute::DocAttribute * > *);
-  HashDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-private:
-  static const jlong serialVersionUID = -1128534486061432528LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashDocAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintJobAttributeSet.h b/libjava/javax/print/attribute/HashPrintJobAttributeSet.h
deleted file mode 100644
index 26fde6f998d..00000000000
--- a/libjava/javax/print/attribute/HashPrintJobAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintJobAttributeSet__
-#define __javax_print_attribute_HashPrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintJobAttributeSet;
-          class PrintJobAttribute;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintJobAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintJobAttributeSet();
-  HashPrintJobAttributeSet(::javax::print::attribute::PrintJobAttribute *);
-  HashPrintJobAttributeSet(JArray< ::javax::print::attribute::PrintJobAttribute * > *);
-  HashPrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-private:
-  static const jlong serialVersionUID = -4204473656070350348LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h b/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h
deleted file mode 100644
index a1232a21100..00000000000
--- a/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintRequestAttributeSet__
-#define __javax_print_attribute_HashPrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintRequestAttributeSet;
-          class PrintRequestAttribute;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintRequestAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintRequestAttributeSet();
-  HashPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttribute *);
-  HashPrintRequestAttributeSet(JArray< ::javax::print::attribute::PrintRequestAttribute * > *);
-  HashPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-private:
-  static const jlong serialVersionUID = 2364756266107751933LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h b/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h
deleted file mode 100644
index abf583a7252..00000000000
--- a/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintServiceAttributeSet__
-#define __javax_print_attribute_HashPrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintServiceAttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintServiceAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintServiceAttributeSet();
-  HashPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttribute *);
-  HashPrintServiceAttributeSet(JArray< ::javax::print::attribute::PrintServiceAttribute * > *);
-  HashPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-private:
-  static const jlong serialVersionUID = 6642904616179203070LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/IntegerSyntax.h b/libjava/javax/print/attribute/IntegerSyntax.h
deleted file mode 100644
index 63ac7e04050..00000000000
--- a/libjava/javax/print/attribute/IntegerSyntax.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_IntegerSyntax__
-#define __javax_print_attribute_IntegerSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class IntegerSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::IntegerSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  IntegerSyntax(jint);
-  IntegerSyntax(jint, jint, jint);
-public:
-  virtual jint getValue();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_IntegerSyntax__
diff --git a/libjava/javax/print/attribute/PrintJobAttribute.h b/libjava/javax/print/attribute/PrintJobAttribute.h
deleted file mode 100644
index c22e5d716aa..00000000000
--- a/libjava/javax/print/attribute/PrintJobAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintJobAttribute__
-#define __javax_print_attribute_PrintJobAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintJobAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintJobAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintJobAttribute__
diff --git a/libjava/javax/print/attribute/PrintJobAttributeSet.h b/libjava/javax/print/attribute/PrintJobAttributeSet.h
deleted file mode 100644
index 713ad66cde3..00000000000
--- a/libjava/javax/print/attribute/PrintJobAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintJobAttributeSet__
-#define __javax_print_attribute_PrintJobAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintJobAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/PrintRequestAttribute.h b/libjava/javax/print/attribute/PrintRequestAttribute.h
deleted file mode 100644
index 7d95bfcb157..00000000000
--- a/libjava/javax/print/attribute/PrintRequestAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintRequestAttribute__
-#define __javax_print_attribute_PrintRequestAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintRequestAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintRequestAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintRequestAttribute__
diff --git a/libjava/javax/print/attribute/PrintRequestAttributeSet.h b/libjava/javax/print/attribute/PrintRequestAttributeSet.h
deleted file mode 100644
index 9929176608b..00000000000
--- a/libjava/javax/print/attribute/PrintRequestAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintRequestAttributeSet__
-#define __javax_print_attribute_PrintRequestAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintRequestAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/PrintServiceAttribute.h b/libjava/javax/print/attribute/PrintServiceAttribute.h
deleted file mode 100644
index eae08643857..00000000000
--- a/libjava/javax/print/attribute/PrintServiceAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintServiceAttribute__
-#define __javax_print_attribute_PrintServiceAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintServiceAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintServiceAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintServiceAttribute__
diff --git a/libjava/javax/print/attribute/PrintServiceAttributeSet.h b/libjava/javax/print/attribute/PrintServiceAttributeSet.h
deleted file mode 100644
index 73db991c915..00000000000
--- a/libjava/javax/print/attribute/PrintServiceAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintServiceAttributeSet__
-#define __javax_print_attribute_PrintServiceAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintServiceAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/ResolutionSyntax.h b/libjava/javax/print/attribute/ResolutionSyntax.h
deleted file mode 100644
index 107642dd4c4..00000000000
--- a/libjava/javax/print/attribute/ResolutionSyntax.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_ResolutionSyntax__
-#define __javax_print_attribute_ResolutionSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class ResolutionSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::ResolutionSyntax : public ::java::lang::Object
-{
-
-public:
-  ResolutionSyntax(jint, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint getCrossFeedResolution(jint);
-public: // actually protected
-  virtual jint getCrossFeedResolutionDphi();
-public:
-  virtual jint getFeedResolution(jint);
-public: // actually protected
-  virtual jint getFeedResolutionDphi();
-public:
-  virtual JArray< jint > * getResolution(jint);
-  virtual jint hashCode();
-  virtual jboolean lessThanOrEquals(::javax::print::attribute::ResolutionSyntax *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jint, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2706743076526672017LL;
-public:
-  static const jint DPCM = 254;
-  static const jint DPI = 100;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) crossFeedResolution;
-  jint feedResolution;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_ResolutionSyntax__
diff --git a/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h b/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h
deleted file mode 100644
index 0caee530c67..00000000000
--- a/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SetOfIntegerSyntax$1__
-#define __javax_print_attribute_SetOfIntegerSyntax$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class SetOfIntegerSyntax$1;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SetOfIntegerSyntax$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SetOfIntegerSyntax$1();
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_SetOfIntegerSyntax$1__
diff --git a/libjava/javax/print/attribute/SetOfIntegerSyntax.h b/libjava/javax/print/attribute/SetOfIntegerSyntax.h
deleted file mode 100644
index 302544fcd60..00000000000
--- a/libjava/javax/print/attribute/SetOfIntegerSyntax.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SetOfIntegerSyntax__
-#define __javax_print_attribute_SetOfIntegerSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class StringCharacterIterator;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class IntegerSyntax;
-          class SetOfIntegerSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SetOfIntegerSyntax : public ::java::lang::Object
-{
-
-  static JArray< JArray< jint > * > * normalize(JArray< JArray< jint > * > *, jint);
-public: // actually protected
-  SetOfIntegerSyntax(jint);
-  SetOfIntegerSyntax(JArray< JArray< jint > * > *);
-private:
-  jboolean skipWhitespace(::java::text::StringCharacterIterator *);
-  jboolean skipNumber(::java::text::StringCharacterIterator *);
-public: // actually protected
-  SetOfIntegerSyntax(::java::lang::String *);
-  SetOfIntegerSyntax(jint, jint);
-public:
-  virtual jboolean contains(jint);
-  virtual jboolean contains(::javax::print::attribute::IntegerSyntax *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< JArray< jint > * > * getMembers();
-  virtual jint hashCode();
-  virtual jint next(jint);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3666874174847632203LL;
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) members;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_SetOfIntegerSyntax__
diff --git a/libjava/javax/print/attribute/Size2DSyntax.h b/libjava/javax/print/attribute/Size2DSyntax.h
deleted file mode 100644
index 36280a50ddc..00000000000
--- a/libjava/javax/print/attribute/Size2DSyntax.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_Size2DSyntax__
-#define __javax_print_attribute_Size2DSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Size2DSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::Size2DSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  Size2DSyntax(jfloat, jfloat, jint);
-  Size2DSyntax(jint, jint, jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< jfloat > * getSize(jint);
-  virtual jfloat getX(jint);
-public: // actually protected
-  virtual jint getXMicrometers();
-public:
-  virtual jfloat getY(jint);
-public: // actually protected
-  virtual jint getYMicrometers();
-public:
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jint, ::java::lang::String *);
-  static const jint INCH = 25400;
-  static const jint MM = 1000;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_Size2DSyntax__
diff --git a/libjava/javax/print/attribute/SupportedValuesAttribute.h b/libjava/javax/print/attribute/SupportedValuesAttribute.h
deleted file mode 100644
index 26b2b2b8edf..00000000000
--- a/libjava/javax/print/attribute/SupportedValuesAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SupportedValuesAttribute__
-#define __javax_print_attribute_SupportedValuesAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class SupportedValuesAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SupportedValuesAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_SupportedValuesAttribute__
diff --git a/libjava/javax/print/attribute/TextSyntax.h b/libjava/javax/print/attribute/TextSyntax.h
deleted file mode 100644
index b22700d0b58..00000000000
--- a/libjava/javax/print/attribute/TextSyntax.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_TextSyntax__
-#define __javax_print_attribute_TextSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class TextSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::TextSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  TextSyntax(::java::lang::String *, ::java::util::Locale *);
-public:
-  virtual ::java::lang::String * getValue();
-  virtual ::java::util::Locale * getLocale();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -8130648736378144102LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  ::java::util::Locale * locale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_TextSyntax__
diff --git a/libjava/javax/print/attribute/URISyntax.h b/libjava/javax/print/attribute/URISyntax.h
deleted file mode 100644
index 9c38d5c5e0f..00000000000
--- a/libjava/javax/print/attribute/URISyntax.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_URISyntax__
-#define __javax_print_attribute_URISyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class URISyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::URISyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  URISyntax(::java::net::URI *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::net::URI * getURI();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -7842661210486401678LL;
-  ::java::net::URI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) uri;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_URISyntax__
diff --git a/libjava/javax/print/attribute/UnmodifiableSetException.h b/libjava/javax/print/attribute/UnmodifiableSetException.h
deleted file mode 100644
index 33bc1289993..00000000000
--- a/libjava/javax/print/attribute/UnmodifiableSetException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_UnmodifiableSetException__
-#define __javax_print_attribute_UnmodifiableSetException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class UnmodifiableSetException;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::UnmodifiableSetException : public ::java::lang::RuntimeException
-{
-
-public:
-  UnmodifiableSetException();
-  UnmodifiableSetException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_UnmodifiableSetException__
diff --git a/libjava/javax/print/attribute/standard/Chromaticity.h b/libjava/javax/print/attribute/standard/Chromaticity.h
deleted file mode 100644
index 9571ef86cc7..00000000000
--- a/libjava/javax/print/attribute/standard/Chromaticity.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Chromaticity__
-#define __javax_print_attribute_standard_Chromaticity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Chromaticity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Chromaticity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Chromaticity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 4660543931355214012LL;
-public:
-  static ::javax::print::attribute::standard::Chromaticity * MONOCHROME;
-  static ::javax::print::attribute::standard::Chromaticity * COLOR;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Chromaticity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Chromaticity__
diff --git a/libjava/javax/print/attribute/standard/ColorSupported.h b/libjava/javax/print/attribute/standard/ColorSupported.h
deleted file mode 100644
index 085c0cdc24d..00000000000
--- a/libjava/javax/print/attribute/standard/ColorSupported.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_ColorSupported__
-#define __javax_print_attribute_standard_ColorSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class ColorSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::ColorSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  ColorSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -2700555589688535545LL;
-public:
-  static ::javax::print::attribute::standard::ColorSupported * NOT_SUPPORTED;
-  static ::javax::print::attribute::standard::ColorSupported * SUPPORTED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::ColorSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_ColorSupported__
diff --git a/libjava/javax/print/attribute/standard/Compression.h b/libjava/javax/print/attribute/standard/Compression.h
deleted file mode 100644
index f1dc555680c..00000000000
--- a/libjava/javax/print/attribute/standard/Compression.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Compression__
-#define __javax_print_attribute_standard_Compression__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Compression;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Compression : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Compression(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -5716748913324997674LL;
-public:
-  static ::javax::print::attribute::standard::Compression * NONE;
-  static ::javax::print::attribute::standard::Compression * DEFLATE;
-  static ::javax::print::attribute::standard::Compression * GZIP;
-  static ::javax::print::attribute::standard::Compression * COMPRESS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Compression * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Compression__
diff --git a/libjava/javax/print/attribute/standard/Copies.h b/libjava/javax/print/attribute/standard/Copies.h
deleted file mode 100644
index d2c277c8c7a..00000000000
--- a/libjava/javax/print/attribute/standard/Copies.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Copies__
-#define __javax_print_attribute_standard_Copies__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Copies;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Copies : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  Copies(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6426631521680023833LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Copies__
diff --git a/libjava/javax/print/attribute/standard/CopiesSupported.h b/libjava/javax/print/attribute/standard/CopiesSupported.h
deleted file mode 100644
index 62c3428645a..00000000000
--- a/libjava/javax/print/attribute/standard/CopiesSupported.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_CopiesSupported__
-#define __javax_print_attribute_standard_CopiesSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class CopiesSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::CopiesSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  CopiesSupported(jint);
-  CopiesSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6927711687034846001LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_CopiesSupported__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h b/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h
deleted file mode 100644
index 1b012a34e8c..00000000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtCompleted__
-#define __javax_print_attribute_standard_DateTimeAtCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtCompleted : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtCompleted(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6497399708058490000LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtCompleted__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtCreation.h b/libjava/javax/print/attribute/standard/DateTimeAtCreation.h
deleted file mode 100644
index a88c7c128fb..00000000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtCreation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtCreation__
-#define __javax_print_attribute_standard_DateTimeAtCreation__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtCreation;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtCreation : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtCreation(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2923732231056647903LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtCreation__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h b/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h
deleted file mode 100644
index 8f50d1b9014..00000000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtProcessing__
-#define __javax_print_attribute_standard_DateTimeAtProcessing__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtProcessing;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtProcessing : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtProcessing(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -3710068197278263244LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtProcessing__
diff --git a/libjava/javax/print/attribute/standard/Destination.h b/libjava/javax/print/attribute/standard/Destination.h
deleted file mode 100644
index b9d5d996f46..00000000000
--- a/libjava/javax/print/attribute/standard/Destination.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Destination__
-#define __javax_print_attribute_standard_Destination__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Destination;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Destination : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  Destination(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6776739171700415321LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Destination__
diff --git a/libjava/javax/print/attribute/standard/DocumentName.h b/libjava/javax/print/attribute/standard/DocumentName.h
deleted file mode 100644
index 6ed7121309e..00000000000
--- a/libjava/javax/print/attribute/standard/DocumentName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DocumentName__
-#define __javax_print_attribute_standard_DocumentName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DocumentName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DocumentName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  DocumentName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7883105848533280430LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DocumentName__
diff --git a/libjava/javax/print/attribute/standard/Fidelity.h b/libjava/javax/print/attribute/standard/Fidelity.h
deleted file mode 100644
index ac31da58512..00000000000
--- a/libjava/javax/print/attribute/standard/Fidelity.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Fidelity__
-#define __javax_print_attribute_standard_Fidelity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Fidelity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Fidelity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Fidelity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 6320827847329172308LL;
-public:
-  static ::javax::print::attribute::standard::Fidelity * FIDELITY_TRUE;
-  static ::javax::print::attribute::standard::Fidelity * FIDELITY_FALSE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Fidelity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Fidelity__
diff --git a/libjava/javax/print/attribute/standard/Finishings.h b/libjava/javax/print/attribute/standard/Finishings.h
deleted file mode 100644
index 6b228c815e5..00000000000
--- a/libjava/javax/print/attribute/standard/Finishings.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Finishings__
-#define __javax_print_attribute_standard_Finishings__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Finishings;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Finishings : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Finishings(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -627840419548391754LL;
-public:
-  static ::javax::print::attribute::standard::Finishings * NONE;
-  static ::javax::print::attribute::standard::Finishings * STAPLE;
-  static ::javax::print::attribute::standard::Finishings * COVER;
-  static ::javax::print::attribute::standard::Finishings * BIND;
-  static ::javax::print::attribute::standard::Finishings * SADDLE_STITCH;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_TOP_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_BOTTOM_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_TOP_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_BOTTOM_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_LEFT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_TOP;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_BOTTOM;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_TOP;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_BOTTOM;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Finishings * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Finishings__
diff --git a/libjava/javax/print/attribute/standard/JobHoldUntil.h b/libjava/javax/print/attribute/standard/JobHoldUntil.h
deleted file mode 100644
index c13c5273a79..00000000000
--- a/libjava/javax/print/attribute/standard/JobHoldUntil.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobHoldUntil__
-#define __javax_print_attribute_standard_JobHoldUntil__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobHoldUntil;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobHoldUntil : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  JobHoldUntil(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1664471048860415024LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobHoldUntil__
diff --git a/libjava/javax/print/attribute/standard/JobImpressions.h b/libjava/javax/print/attribute/standard/JobImpressions.h
deleted file mode 100644
index 0cf000685db..00000000000
--- a/libjava/javax/print/attribute/standard/JobImpressions.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressions__
-#define __javax_print_attribute_standard_JobImpressions__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressions;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressions : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobImpressions(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 8225537206784322464LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressions__
diff --git a/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h b/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h
deleted file mode 100644
index 37deda52d1c..00000000000
--- a/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressionsCompleted__
-#define __javax_print_attribute_standard_JobImpressionsCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressionsCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressionsCompleted : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobImpressionsCompleted(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6722648442432393294LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressionsCompleted__
diff --git a/libjava/javax/print/attribute/standard/JobImpressionsSupported.h b/libjava/javax/print/attribute/standard/JobImpressionsSupported.h
deleted file mode 100644
index 83f5c1b80d2..00000000000
--- a/libjava/javax/print/attribute/standard/JobImpressionsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressionsSupported__
-#define __javax_print_attribute_standard_JobImpressionsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressionsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressionsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobImpressionsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4887354803843173692LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressionsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobKOctets.h b/libjava/javax/print/attribute/standard/JobKOctets.h
deleted file mode 100644
index 35241fc1f8d..00000000000
--- a/libjava/javax/print/attribute/standard/JobKOctets.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctets__
-#define __javax_print_attribute_standard_JobKOctets__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctets : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobKOctets(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -8959710146498202869LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctets__
diff --git a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h b/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h
deleted file mode 100644
index 8eb274b2caf..00000000000
--- a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctetsProcessed__
-#define __javax_print_attribute_standard_JobKOctetsProcessed__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctetsProcessed;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctetsProcessed : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobKOctetsProcessed(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6265238509657881806LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctetsProcessed__
diff --git a/libjava/javax/print/attribute/standard/JobKOctetsSupported.h b/libjava/javax/print/attribute/standard/JobKOctetsSupported.h
deleted file mode 100644
index 455211eb4bb..00000000000
--- a/libjava/javax/print/attribute/standard/JobKOctetsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctetsSupported__
-#define __javax_print_attribute_standard_JobKOctetsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctetsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctetsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobKOctetsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2867871140549897443LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctetsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheets.h b/libjava/javax/print/attribute/standard/JobMediaSheets.h
deleted file mode 100644
index 4f21d416029..00000000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheets.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheets__
-#define __javax_print_attribute_standard_JobMediaSheets__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheets : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobMediaSheets(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 408871131531979741LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheets__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h b/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h
deleted file mode 100644
index e12bf25359e..00000000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheetsCompleted__
-#define __javax_print_attribute_standard_JobMediaSheetsCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheetsCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheetsCompleted : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobMediaSheetsCompleted(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 1739595973810840475LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheetsCompleted__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h b/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h
deleted file mode 100644
index b451ce4651c..00000000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheetsSupported__
-#define __javax_print_attribute_standard_JobMediaSheetsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheetsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheetsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobMediaSheetsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2953685470388672940LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheetsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobMessageFromOperator.h b/libjava/javax/print/attribute/standard/JobMessageFromOperator.h
deleted file mode 100644
index 4c43f0d888a..00000000000
--- a/libjava/javax/print/attribute/standard/JobMessageFromOperator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMessageFromOperator__
-#define __javax_print_attribute_standard_JobMessageFromOperator__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMessageFromOperator;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMessageFromOperator : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobMessageFromOperator(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4620751846003142047LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMessageFromOperator__
diff --git a/libjava/javax/print/attribute/standard/JobName.h b/libjava/javax/print/attribute/standard/JobName.h
deleted file mode 100644
index 4147be41c4d..00000000000
--- a/libjava/javax/print/attribute/standard/JobName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobName__
-#define __javax_print_attribute_standard_JobName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4660359192078689545LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobName__
diff --git a/libjava/javax/print/attribute/standard/JobOriginatingUserName.h b/libjava/javax/print/attribute/standard/JobOriginatingUserName.h
deleted file mode 100644
index a3ba06784ae..00000000000
--- a/libjava/javax/print/attribute/standard/JobOriginatingUserName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobOriginatingUserName__
-#define __javax_print_attribute_standard_JobOriginatingUserName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobOriginatingUserName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobOriginatingUserName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobOriginatingUserName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -8052537926362933477LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobOriginatingUserName__
diff --git a/libjava/javax/print/attribute/standard/JobPriority.h b/libjava/javax/print/attribute/standard/JobPriority.h
deleted file mode 100644
index 54a46220f16..00000000000
--- a/libjava/javax/print/attribute/standard/JobPriority.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobPriority__
-#define __javax_print_attribute_standard_JobPriority__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobPriority;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobPriority : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobPriority(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4599900369040602769LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobPriority__
diff --git a/libjava/javax/print/attribute/standard/JobPrioritySupported.h b/libjava/javax/print/attribute/standard/JobPrioritySupported.h
deleted file mode 100644
index c131fe76b91..00000000000
--- a/libjava/javax/print/attribute/standard/JobPrioritySupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobPrioritySupported__
-#define __javax_print_attribute_standard_JobPrioritySupported__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobPrioritySupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobPrioritySupported : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobPrioritySupported(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2564840378013555894LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobPrioritySupported__
diff --git a/libjava/javax/print/attribute/standard/JobSheets.h b/libjava/javax/print/attribute/standard/JobSheets.h
deleted file mode 100644
index 8ab9c7febf2..00000000000
--- a/libjava/javax/print/attribute/standard/JobSheets.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobSheets__
-#define __javax_print_attribute_standard_JobSheets__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobSheets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobSheets : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobSheets(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -4735258056132519759LL;
-public:
-  static ::javax::print::attribute::standard::JobSheets * NONE;
-  static ::javax::print::attribute::standard::JobSheets * STANDARD;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobSheets * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobSheets__
diff --git a/libjava/javax/print/attribute/standard/JobState.h b/libjava/javax/print/attribute/standard/JobState.h
deleted file mode 100644
index dc6c1ec7e53..00000000000
--- a/libjava/javax/print/attribute/standard/JobState.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobState__
-#define __javax_print_attribute_standard_JobState__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobState;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobState : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobState(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 400465010094018920LL;
-public:
-  static ::javax::print::attribute::standard::JobState * UNKNOWN;
-  static ::javax::print::attribute::standard::JobState * PENDING;
-  static ::javax::print::attribute::standard::JobState * PENDING_HELD;
-  static ::javax::print::attribute::standard::JobState * PROCESSING;
-  static ::javax::print::attribute::standard::JobState * PROCESSING_STOPPED;
-  static ::javax::print::attribute::standard::JobState * CANCELED;
-  static ::javax::print::attribute::standard::JobState * ABORTED;
-  static ::javax::print::attribute::standard::JobState * COMPLETED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobState * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobState__
diff --git a/libjava/javax/print/attribute/standard/JobStateReason.h b/libjava/javax/print/attribute/standard/JobStateReason.h
deleted file mode 100644
index b641ef6e84f..00000000000
--- a/libjava/javax/print/attribute/standard/JobStateReason.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobStateReason__
-#define __javax_print_attribute_standard_JobStateReason__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobStateReason;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobStateReason : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobStateReason(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -8765894420449009168LL;
-public:
-  static ::javax::print::attribute::standard::JobStateReason * JOB_INCOMING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_DATA_INSUFFICIENT;
-  static ::javax::print::attribute::standard::JobStateReason * DOCUMENT_ACCESS_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * SUBMISSION_INTERRUPTED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_OUTGOING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_HOLD_UNTIL_SPECIFIED;
-  static ::javax::print::attribute::standard::JobStateReason * RESOURCES_ARE_NOT_READY;
-  static ::javax::print::attribute::standard::JobStateReason * PRINTER_STOPPED_PARTLY;
-  static ::javax::print::attribute::standard::JobStateReason * PRINTER_STOPPED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_INTERPRETING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_QUEUED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_TRANSFORMING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_QUEUED_FOR_MARKER;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_PRINTING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_BY_USER;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_BY_OPERATOR;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_AT_DEVICE;
-  static ::javax::print::attribute::standard::JobStateReason * ABORTED_BY_SYSTEM;
-  static ::javax::print::attribute::standard::JobStateReason * UNSUPPORTED_COMPRESSION;
-  static ::javax::print::attribute::standard::JobStateReason * COMPRESSION_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * UNSUPPORTED_DOCUMENT_FORMAT;
-  static ::javax::print::attribute::standard::JobStateReason * DOCUMENT_FORMAT_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * PROCESSING_TO_STOP_POINT;
-  static ::javax::print::attribute::standard::JobStateReason * SERVICE_OFF_LINE;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_SUCCESSFULLY;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_WITH_WARNINGS;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_WITH_ERRORS;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_RESTARTABLE;
-  static ::javax::print::attribute::standard::JobStateReason * QUEUED_IN_DEVICE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobStateReason * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobStateReason__
diff --git a/libjava/javax/print/attribute/standard/JobStateReasons.h b/libjava/javax/print/attribute/standard/JobStateReasons.h
deleted file mode 100644
index e02a3e7e99b..00000000000
--- a/libjava/javax/print/attribute/standard/JobStateReasons.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobStateReasons__
-#define __javax_print_attribute_standard_JobStateReasons__
-
-#pragma interface
-
-#include <java/util/HashSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobStateReason;
-            class JobStateReasons;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobStateReasons : public ::java::util::HashSet
-{
-
-public:
-  JobStateReasons();
-  JobStateReasons(jint, jfloat);
-  JobStateReasons(jint);
-  JobStateReasons(::java::util::Collection *);
-  jboolean JobStateReasons$add(::javax::print::attribute::standard::JobStateReason *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  jboolean add(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 8849088261264331812LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobStateReasons__
diff --git a/libjava/javax/print/attribute/standard/Media.h b/libjava/javax/print/attribute/standard/Media.h
deleted file mode 100644
index e4c013b1594..00000000000
--- a/libjava/javax/print/attribute/standard/Media.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Media__
-#define __javax_print_attribute_standard_Media__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Media;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Media : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Media(jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2823970704630722439LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Media__
diff --git a/libjava/javax/print/attribute/standard/MediaName.h b/libjava/javax/print/attribute/standard/MediaName.h
deleted file mode 100644
index 160d6bbc461..00000000000
--- a/libjava/javax/print/attribute/standard/MediaName.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaName__
-#define __javax_print_attribute_standard_MediaName__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaName : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaName(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 4653117714524155448LL;
-public:
-  static ::javax::print::attribute::standard::MediaName * NA_LETTER_WHITE;
-  static ::javax::print::attribute::standard::MediaName * NA_LETTER_TRANSPARENT;
-  static ::javax::print::attribute::standard::MediaName * ISO_A4_WHITE;
-  static ::javax::print::attribute::standard::MediaName * ISO_A4_TRANSPARENT;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaName * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaName__
diff --git a/libjava/javax/print/attribute/standard/MediaPrintableArea.h b/libjava/javax/print/attribute/standard/MediaPrintableArea.h
deleted file mode 100644
index 89c96109b74..00000000000
--- a/libjava/javax/print/attribute/standard/MediaPrintableArea.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaPrintableArea__
-#define __javax_print_attribute_standard_MediaPrintableArea__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaPrintableArea;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaPrintableArea : public ::java::lang::Object
-{
-
-public:
-  MediaPrintableArea(jfloat, jfloat, jfloat, jfloat, jint);
-  MediaPrintableArea(jint, jint, jint, jint, jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  jfloat getHeight(jint);
-  jfloat getWidth(jint);
-  jfloat getX(jint);
-  jfloat getY(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * toString();
-  jint hashCode();
-  ::java::lang::String * toString(jint, ::java::lang::String *);
-  JArray< jfloat > * getPrintableArea(jint);
-private:
-  static const jlong serialVersionUID = -1597171464050795793LL;
-public:
-  static const jint INCH = 25400;
-  static const jint MM = 1000;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint w;
-  jint h;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaPrintableArea__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$Engineering.h b/libjava/javax/print/attribute/standard/MediaSize$Engineering.h
deleted file mode 100644
index ae8edcce79f..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$Engineering.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$Engineering__
-#define __javax_print_attribute_standard_MediaSize$Engineering__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$Engineering;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$Engineering : public ::java::lang::Object
-{
-
-  MediaSize$Engineering();
-public:
-  static ::javax::print::attribute::standard::MediaSize * A;
-  static ::javax::print::attribute::standard::MediaSize * B;
-  static ::javax::print::attribute::standard::MediaSize * C;
-  static ::javax::print::attribute::standard::MediaSize * D;
-  static ::javax::print::attribute::standard::MediaSize * E;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$Engineering__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$ISO.h b/libjava/javax/print/attribute/standard/MediaSize$ISO.h
deleted file mode 100644
index 08656462d30..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$ISO.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$ISO__
-#define __javax_print_attribute_standard_MediaSize$ISO__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$ISO;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$ISO : public ::java::lang::Object
-{
-
-  MediaSize$ISO();
-public:
-  static ::javax::print::attribute::standard::MediaSize * A0;
-  static ::javax::print::attribute::standard::MediaSize * A1;
-  static ::javax::print::attribute::standard::MediaSize * A2;
-  static ::javax::print::attribute::standard::MediaSize * A3;
-  static ::javax::print::attribute::standard::MediaSize * A4;
-  static ::javax::print::attribute::standard::MediaSize * A5;
-  static ::javax::print::attribute::standard::MediaSize * A6;
-  static ::javax::print::attribute::standard::MediaSize * A7;
-  static ::javax::print::attribute::standard::MediaSize * A8;
-  static ::javax::print::attribute::standard::MediaSize * A9;
-  static ::javax::print::attribute::standard::MediaSize * A10;
-  static ::javax::print::attribute::standard::MediaSize * B0;
-  static ::javax::print::attribute::standard::MediaSize * B1;
-  static ::javax::print::attribute::standard::MediaSize * B2;
-  static ::javax::print::attribute::standard::MediaSize * B3;
-  static ::javax::print::attribute::standard::MediaSize * B4;
-  static ::javax::print::attribute::standard::MediaSize * B5;
-  static ::javax::print::attribute::standard::MediaSize * B6;
-  static ::javax::print::attribute::standard::MediaSize * B7;
-  static ::javax::print::attribute::standard::MediaSize * B8;
-  static ::javax::print::attribute::standard::MediaSize * B9;
-  static ::javax::print::attribute::standard::MediaSize * B10;
-  static ::javax::print::attribute::standard::MediaSize * C3;
-  static ::javax::print::attribute::standard::MediaSize * C4;
-  static ::javax::print::attribute::standard::MediaSize * C5;
-  static ::javax::print::attribute::standard::MediaSize * C6;
-  static ::javax::print::attribute::standard::MediaSize * DESIGNATED_LONG;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$ISO__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$JIS.h b/libjava/javax/print/attribute/standard/MediaSize$JIS.h
deleted file mode 100644
index be1545798d6..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$JIS.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$JIS__
-#define __javax_print_attribute_standard_MediaSize$JIS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$JIS;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$JIS : public ::java::lang::Object
-{
-
-  MediaSize$JIS();
-public:
-  static ::javax::print::attribute::standard::MediaSize * B0;
-  static ::javax::print::attribute::standard::MediaSize * B1;
-  static ::javax::print::attribute::standard::MediaSize * B2;
-  static ::javax::print::attribute::standard::MediaSize * B3;
-  static ::javax::print::attribute::standard::MediaSize * B4;
-  static ::javax::print::attribute::standard::MediaSize * B5;
-  static ::javax::print::attribute::standard::MediaSize * B6;
-  static ::javax::print::attribute::standard::MediaSize * B7;
-  static ::javax::print::attribute::standard::MediaSize * B8;
-  static ::javax::print::attribute::standard::MediaSize * B9;
-  static ::javax::print::attribute::standard::MediaSize * B10;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_1;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_2;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_3;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_4;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_30;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_40;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_0;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_1;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_2;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_20;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_3;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_4;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_5;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_6;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_7;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_8;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_A4;
-  static ::javax::print::attribute::standard::MediaSize * YOU_1;
-  static ::javax::print::attribute::standard::MediaSize * YOU_2;
-  static ::javax::print::attribute::standard::MediaSize * YOU_3;
-  static ::javax::print::attribute::standard::MediaSize * YOU_4;
-  static ::javax::print::attribute::standard::MediaSize * YOU_5;
-  static ::javax::print::attribute::standard::MediaSize * YOU_6;
-  static ::javax::print::attribute::standard::MediaSize * YOU_7;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$JIS__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$NA.h b/libjava/javax/print/attribute/standard/MediaSize$NA.h
deleted file mode 100644
index e0236bfd9aa..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$NA.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$NA__
-#define __javax_print_attribute_standard_MediaSize$NA__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$NA;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$NA : public ::java::lang::Object
-{
-
-  MediaSize$NA();
-public:
-  static ::javax::print::attribute::standard::MediaSize * LEGAL;
-  static ::javax::print::attribute::standard::MediaSize * LETTER;
-  static ::javax::print::attribute::standard::MediaSize * NA_5X7;
-  static ::javax::print::attribute::standard::MediaSize * NA_8X10;
-  static ::javax::print::attribute::standard::MediaSize * NA_6X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_7X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_9x11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_9x12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10x13_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10x14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10X15_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_10_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_14_ENVELOPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$NA__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$Other.h b/libjava/javax/print/attribute/standard/MediaSize$Other.h
deleted file mode 100644
index d95078fbff0..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$Other.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$Other__
-#define __javax_print_attribute_standard_MediaSize$Other__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$Other;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$Other : public ::java::lang::Object
-{
-
-  MediaSize$Other();
-public:
-  static ::javax::print::attribute::standard::MediaSize * EXECUTIVE;
-  static ::javax::print::attribute::standard::MediaSize * FOLIO;
-  static ::javax::print::attribute::standard::MediaSize * QUARTO;
-  static ::javax::print::attribute::standard::MediaSize * INVOICE;
-  static ::javax::print::attribute::standard::MediaSize * LEDGER;
-  static ::javax::print::attribute::standard::MediaSize * MONARCH_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * PERSONAL_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * ITALY_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * JAPANESE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSize * JAPANESE_DOUBLE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSize * TABLOID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$Other__
diff --git a/libjava/javax/print/attribute/standard/MediaSize.h b/libjava/javax/print/attribute/standard/MediaSize.h
deleted file mode 100644
index 3dd5aa9c010..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize__
-#define __javax_print_attribute_standard_MediaSize__
-
-#pragma interface
-
-#include <javax/print/attribute/Size2DSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSizeName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize : public ::javax::print::attribute::Size2DSyntax
-{
-
-public:
-  MediaSize(jfloat, jfloat, jint);
-  MediaSize(jfloat, jfloat, jint, ::javax::print::attribute::standard::MediaSizeName *);
-  MediaSize(jint, jint, jint);
-  MediaSize(jint, jint, jint, ::javax::print::attribute::standard::MediaSizeName *);
-  virtual ::java::lang::Class * getCategory();
-  static ::javax::print::attribute::standard::MediaSizeName * findMedia(jfloat, jfloat, jint);
-  static ::javax::print::attribute::standard::MediaSize * getMediaSizeForName(::javax::print::attribute::standard::MediaSizeName *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::standard::MediaSizeName * getMediaSizeName();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1967958664615414771LL;
-  static ::java::util::ArrayList * mediaCache;
-  ::javax::print::attribute::standard::MediaSizeName * __attribute__((aligned(__alignof__( ::javax::print::attribute::Size2DSyntax)))) mediaName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize__
diff --git a/libjava/javax/print/attribute/standard/MediaSizeName.h b/libjava/javax/print/attribute/standard/MediaSizeName.h
deleted file mode 100644
index fecbee60593..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSizeName.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSizeName__
-#define __javax_print_attribute_standard_MediaSizeName__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaSizeName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSizeName : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaSizeName(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 2778798329756942747LL;
-public:
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A6;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A7;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A8;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A9;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A10;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B6;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B7;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B8;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B9;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B10;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B0;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B1;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B2;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B3;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B4;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B5;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B6;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B7;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B8;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B9;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B10;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C6;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_LETTER;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_LEGAL;
-  static ::javax::print::attribute::standard::MediaSizeName * EXECUTIVE;
-  static ::javax::print::attribute::standard::MediaSizeName * LEDGER;
-  static ::javax::print::attribute::standard::MediaSizeName * TABLOID;
-  static ::javax::print::attribute::standard::MediaSizeName * INVOICE;
-  static ::javax::print::attribute::standard::MediaSizeName * FOLIO;
-  static ::javax::print::attribute::standard::MediaSizeName * QUARTO;
-  static ::javax::print::attribute::standard::MediaSizeName * JAPANESE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSizeName * JAPANESE_DOUBLE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSizeName * A;
-  static ::javax::print::attribute::standard::MediaSizeName * B;
-  static ::javax::print::attribute::standard::MediaSizeName * C;
-  static ::javax::print::attribute::standard::MediaSizeName * D;
-  static ::javax::print::attribute::standard::MediaSizeName * E;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_DESIGNATED_LONG;
-  static ::javax::print::attribute::standard::MediaSizeName * ITALY_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * MONARCH_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * PERSONAL_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_10_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_6X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_7X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_9X11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_9X12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X13_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X15_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_5X7;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_8X10;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaSizeName * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSizeName__
diff --git a/libjava/javax/print/attribute/standard/MediaTray.h b/libjava/javax/print/attribute/standard/MediaTray.h
deleted file mode 100644
index 05fe123f3ea..00000000000
--- a/libjava/javax/print/attribute/standard/MediaTray.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaTray__
-#define __javax_print_attribute_standard_MediaTray__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaTray;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaTray : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaTray(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -982503611095214703LL;
-public:
-  static ::javax::print::attribute::standard::MediaTray * TOP;
-  static ::javax::print::attribute::standard::MediaTray * MIDDLE;
-  static ::javax::print::attribute::standard::MediaTray * BOTTOM;
-  static ::javax::print::attribute::standard::MediaTray * ENVELOPE;
-  static ::javax::print::attribute::standard::MediaTray * MANUAL;
-  static ::javax::print::attribute::standard::MediaTray * LARGE_CAPACITY;
-  static ::javax::print::attribute::standard::MediaTray * MAIN;
-  static ::javax::print::attribute::standard::MediaTray * SIDE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaTray * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaTray__
diff --git a/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h b/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h
deleted file mode 100644
index 27489968e45..00000000000
--- a/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MultipleDocumentHandling__
-#define __javax_print_attribute_standard_MultipleDocumentHandling__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MultipleDocumentHandling;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MultipleDocumentHandling : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  MultipleDocumentHandling(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 8098326460746413466LL;
-public:
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SINGLE_DOCUMENT;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SEPARATE_DOCUMENTS_COLLATED_COPIES;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SINGLE_DOCUMENT_NEW_SHEET;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MultipleDocumentHandling * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MultipleDocumentHandling__
diff --git a/libjava/javax/print/attribute/standard/NumberOfDocuments.h b/libjava/javax/print/attribute/standard/NumberOfDocuments.h
deleted file mode 100644
index 58eae0b5c0a..00000000000
--- a/libjava/javax/print/attribute/standard/NumberOfDocuments.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberOfDocuments__
-#define __javax_print_attribute_standard_NumberOfDocuments__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberOfDocuments;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberOfDocuments : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberOfDocuments(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7891881310684461097LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberOfDocuments__
diff --git a/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h b/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h
deleted file mode 100644
index cdca46991a2..00000000000
--- a/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberOfInterveningJobs__
-#define __javax_print_attribute_standard_NumberOfInterveningJobs__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberOfInterveningJobs;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberOfInterveningJobs : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberOfInterveningJobs(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2568141124844982746LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberOfInterveningJobs__
diff --git a/libjava/javax/print/attribute/standard/NumberUp.h b/libjava/javax/print/attribute/standard/NumberUp.h
deleted file mode 100644
index dfa108f868d..00000000000
--- a/libjava/javax/print/attribute/standard/NumberUp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberUp__
-#define __javax_print_attribute_standard_NumberUp__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberUp;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberUp : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberUp(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -3040436486786527811LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberUp__
diff --git a/libjava/javax/print/attribute/standard/NumberUpSupported.h b/libjava/javax/print/attribute/standard/NumberUpSupported.h
deleted file mode 100644
index aff84dd1f7a..00000000000
--- a/libjava/javax/print/attribute/standard/NumberUpSupported.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberUpSupported__
-#define __javax_print_attribute_standard_NumberUpSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberUpSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberUpSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  NumberUpSupported(jint);
-  NumberUpSupported(JArray< JArray< jint > * > *);
-  NumberUpSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1041573395759141805LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberUpSupported__
diff --git a/libjava/javax/print/attribute/standard/OrientationRequested.h b/libjava/javax/print/attribute/standard/OrientationRequested.h
deleted file mode 100644
index 28e0fc13d63..00000000000
--- a/libjava/javax/print/attribute/standard/OrientationRequested.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_OrientationRequested__
-#define __javax_print_attribute_standard_OrientationRequested__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class OrientationRequested;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::OrientationRequested : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  OrientationRequested(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  jint getOffset();
-private:
-  static const jlong serialVersionUID = -4447437289862822276LL;
-public:
-  static ::javax::print::attribute::standard::OrientationRequested * PORTRAIT;
-  static ::javax::print::attribute::standard::OrientationRequested * LANDSCAPE;
-  static ::javax::print::attribute::standard::OrientationRequested * REVERSE_LANDSCAPE;
-  static ::javax::print::attribute::standard::OrientationRequested * REVERSE_PORTRAIT;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::OrientationRequested * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_OrientationRequested__
diff --git a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h b/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h
deleted file mode 100644
index de03f87193e..00000000000
--- a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_OutputDeviceAssigned__
-#define __javax_print_attribute_standard_OutputDeviceAssigned__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class OutputDeviceAssigned;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::OutputDeviceAssigned : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  OutputDeviceAssigned(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 5486733778854271081LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_OutputDeviceAssigned__
diff --git a/libjava/javax/print/attribute/standard/PDLOverrideSupported.h b/libjava/javax/print/attribute/standard/PDLOverrideSupported.h
deleted file mode 100644
index 525b8781e1a..00000000000
--- a/libjava/javax/print/attribute/standard/PDLOverrideSupported.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PDLOverrideSupported__
-#define __javax_print_attribute_standard_PDLOverrideSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PDLOverrideSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PDLOverrideSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PDLOverrideSupported(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -4393264467928463934LL;
-public:
-  static ::javax::print::attribute::standard::PDLOverrideSupported * NOT_ATTEMPTED;
-  static ::javax::print::attribute::standard::PDLOverrideSupported * ATTEMPTED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PDLOverrideSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PDLOverrideSupported__
diff --git a/libjava/javax/print/attribute/standard/PageRanges.h b/libjava/javax/print/attribute/standard/PageRanges.h
deleted file mode 100644
index 115553060ed..00000000000
--- a/libjava/javax/print/attribute/standard/PageRanges.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PageRanges__
-#define __javax_print_attribute_standard_PageRanges__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PageRanges;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PageRanges : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  PageRanges(jint);
-  PageRanges(JArray< JArray< jint > * > *);
-  PageRanges(jint, jint);
-  PageRanges(::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 8639895197656148392LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PageRanges__
diff --git a/libjava/javax/print/attribute/standard/PagesPerMinute.h b/libjava/javax/print/attribute/standard/PagesPerMinute.h
deleted file mode 100644
index c237fe9dc86..00000000000
--- a/libjava/javax/print/attribute/standard/PagesPerMinute.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PagesPerMinute__
-#define __javax_print_attribute_standard_PagesPerMinute__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PagesPerMinute;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PagesPerMinute : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  PagesPerMinute(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6366403993072862015LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PagesPerMinute__
diff --git a/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h b/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h
deleted file mode 100644
index fad634af9b1..00000000000
--- a/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PagesPerMinuteColor__
-#define __javax_print_attribute_standard_PagesPerMinuteColor__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PagesPerMinuteColor;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PagesPerMinuteColor : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  PagesPerMinuteColor(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 1684993151687470944LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PagesPerMinuteColor__
diff --git a/libjava/javax/print/attribute/standard/PresentationDirection.h b/libjava/javax/print/attribute/standard/PresentationDirection.h
deleted file mode 100644
index cae02422fad..00000000000
--- a/libjava/javax/print/attribute/standard/PresentationDirection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PresentationDirection__
-#define __javax_print_attribute_standard_PresentationDirection__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PresentationDirection;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PresentationDirection : public ::javax::print::attribute::EnumSyntax
-{
-
-  PresentationDirection(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 8294728067230931780LL;
-public:
-  static ::javax::print::attribute::standard::PresentationDirection * TOBOTTOM_TORIGHT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOBOTTOM_TOLEFT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOTOP_TORIGHT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOTOP_TOLEFT;
-  static ::javax::print::attribute::standard::PresentationDirection * TORIGHT_TOBOTTOM;
-  static ::javax::print::attribute::standard::PresentationDirection * TORIGHT_TOTOP;
-  static ::javax::print::attribute::standard::PresentationDirection * TOLEFT_TOBOTTOM;
-  static ::javax::print::attribute::standard::PresentationDirection * TOLEFT_TOTOP;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PresentationDirection * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PresentationDirection__
diff --git a/libjava/javax/print/attribute/standard/PrintQuality.h b/libjava/javax/print/attribute/standard/PrintQuality.h
deleted file mode 100644
index 6c696d6c92c..00000000000
--- a/libjava/javax/print/attribute/standard/PrintQuality.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrintQuality__
-#define __javax_print_attribute_standard_PrintQuality__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrintQuality;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrintQuality : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrintQuality(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -3072341285225858365LL;
-public:
-  static ::javax::print::attribute::standard::PrintQuality * DRAFT;
-  static ::javax::print::attribute::standard::PrintQuality * NORMAL;
-  static ::javax::print::attribute::standard::PrintQuality * HIGH;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrintQuality * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrintQuality__
diff --git a/libjava/javax/print/attribute/standard/PrinterInfo.h b/libjava/javax/print/attribute/standard/PrinterInfo.h
deleted file mode 100644
index 8f9f8281e21..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterInfo.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterInfo__
-#define __javax_print_attribute_standard_PrinterInfo__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterInfo;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterInfo : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterInfo(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7765280618777599727LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterInfo__
diff --git a/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h b/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h
deleted file mode 100644
index 2b8fdbfe8f0..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterIsAcceptingJobs__
-#define __javax_print_attribute_standard_PrinterIsAcceptingJobs__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterIsAcceptingJobs;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterIsAcceptingJobs : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterIsAcceptingJobs(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -5052010680537678061LL;
-public:
-  static ::javax::print::attribute::standard::PrinterIsAcceptingJobs * NOT_ACCEPTING_JOBS;
-  static ::javax::print::attribute::standard::PrinterIsAcceptingJobs * ACCEPTING_JOBS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterIsAcceptingJobs * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterIsAcceptingJobs__
diff --git a/libjava/javax/print/attribute/standard/PrinterLocation.h b/libjava/javax/print/attribute/standard/PrinterLocation.h
deleted file mode 100644
index 8839a0996ef..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterLocation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterLocation__
-#define __javax_print_attribute_standard_PrinterLocation__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterLocation;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterLocation : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterLocation(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1598610039865566337LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterLocation__
diff --git a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h b/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h
deleted file mode 100644
index a121d9d18d4..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMakeAndModel__
-#define __javax_print_attribute_standard_PrinterMakeAndModel__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMakeAndModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMakeAndModel : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterMakeAndModel(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4580461489499351411LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMakeAndModel__
diff --git a/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h b/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h
deleted file mode 100644
index 1028729215b..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMessageFromOperator__
-#define __javax_print_attribute_standard_PrinterMessageFromOperator__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMessageFromOperator;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMessageFromOperator : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterMessageFromOperator(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4486871203218629318LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMessageFromOperator__
diff --git a/libjava/javax/print/attribute/standard/PrinterMoreInfo.h b/libjava/javax/print/attribute/standard/PrinterMoreInfo.h
deleted file mode 100644
index 3a979cf950a..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterMoreInfo.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMoreInfo__
-#define __javax_print_attribute_standard_PrinterMoreInfo__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMoreInfo;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMoreInfo : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterMoreInfo(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4555850007675338574LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMoreInfo__
diff --git a/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h b/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h
deleted file mode 100644
index bd7c297b391..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
-#define __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMoreInfoManufacturer;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMoreInfoManufacturer : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterMoreInfoManufacturer(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 3323271346485076608LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
diff --git a/libjava/javax/print/attribute/standard/PrinterName.h b/libjava/javax/print/attribute/standard/PrinterName.h
deleted file mode 100644
index fd70e824c6b..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterName__
-#define __javax_print_attribute_standard_PrinterName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 299740639137803127LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterName__
diff --git a/libjava/javax/print/attribute/standard/PrinterResolution.h b/libjava/javax/print/attribute/standard/PrinterResolution.h
deleted file mode 100644
index a0a5b49c2a8..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterResolution.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterResolution__
-#define __javax_print_attribute_standard_PrinterResolution__
-
-#pragma interface
-
-#include <javax/print/attribute/ResolutionSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterResolution;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterResolution : public ::javax::print::attribute::ResolutionSyntax
-{
-
-public:
-  PrinterResolution(jint, jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 13090306561090558LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterResolution__
diff --git a/libjava/javax/print/attribute/standard/PrinterState.h b/libjava/javax/print/attribute/standard/PrinterState.h
deleted file mode 100644
index 7efde73334c..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterState.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterState__
-#define __javax_print_attribute_standard_PrinterState__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterState;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterState : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterState(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -649578618346507718LL;
-public:
-  static ::javax::print::attribute::standard::PrinterState * UNKNOWN;
-  static ::javax::print::attribute::standard::PrinterState * IDLE;
-  static ::javax::print::attribute::standard::PrinterState * PROCESSING;
-  static ::javax::print::attribute::standard::PrinterState * STOPPED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterState * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterState__
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReason.h b/libjava/javax/print/attribute/standard/PrinterStateReason.h
deleted file mode 100644
index 04b83358af9..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterStateReason.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterStateReason__
-#define __javax_print_attribute_standard_PrinterStateReason__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterStateReason;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterStateReason : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterStateReason(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -1623720656201472593LL;
-public:
-  static ::javax::print::attribute::standard::PrinterStateReason * OTHER;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_NEEDED;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_JAM;
-  static ::javax::print::attribute::standard::PrinterStateReason * MOVING_TO_PAUSED;
-  static ::javax::print::attribute::standard::PrinterStateReason * PAUSED;
-  static ::javax::print::attribute::standard::PrinterStateReason * SHUTDOWN;
-  static ::javax::print::attribute::standard::PrinterStateReason * CONNECTING_TO_DEVICE;
-  static ::javax::print::attribute::standard::PrinterStateReason * TIMED_OUT;
-  static ::javax::print::attribute::standard::PrinterStateReason * STOPPING;
-  static ::javax::print::attribute::standard::PrinterStateReason * STOPPED_PARTLY;
-  static ::javax::print::attribute::standard::PrinterStateReason * TONER_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * TONER_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * SPOOL_AREA_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * COVER_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * INTERLOCK_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * DOOR_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * INPUT_TRAY_MISSING;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_TRAY_MISSING;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_AREA_ALMOST_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_AREA_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_SUPPLY_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_SUPPLY_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_WASTE_ALMOST_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_WASTE_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * FUSER_OVER_TEMP;
-  static ::javax::print::attribute::standard::PrinterStateReason * FUSER_UNDER_TEMP;
-  static ::javax::print::attribute::standard::PrinterStateReason * OPC_NEAR_EOL;
-  static ::javax::print::attribute::standard::PrinterStateReason * OPC_LIFE_OVER;
-  static ::javax::print::attribute::standard::PrinterStateReason * DEVELOPER_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * DEVELOPER_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * INTERPRETER_RESOURCE_UNAVAILABLE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterStateReason * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterStateReason__
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReasons.h b/libjava/javax/print/attribute/standard/PrinterStateReasons.h
deleted file mode 100644
index fc3d70330e4..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterStateReasons.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterStateReasons__
-#define __javax_print_attribute_standard_PrinterStateReasons__
-
-#pragma interface
-
-#include <java/util/HashMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterStateReason;
-            class PrinterStateReasons;
-            class Severity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterStateReasons : public ::java::util::HashMap
-{
-
-public:
-  PrinterStateReasons();
-  PrinterStateReasons(jint, jfloat);
-  PrinterStateReasons(jint);
-  PrinterStateReasons(::java::util::Map *);
-  ::java::util::Set * printerStateReasonSet(::javax::print::attribute::standard::Severity *);
-  ::javax::print::attribute::standard::Severity * PrinterStateReasons$put(::javax::print::attribute::standard::PrinterStateReason *, ::javax::print::attribute::standard::Severity *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -3731791085163619457LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterStateReasons__
diff --git a/libjava/javax/print/attribute/standard/PrinterURI.h b/libjava/javax/print/attribute/standard/PrinterURI.h
deleted file mode 100644
index b5dc5c269d4..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterURI.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterURI__
-#define __javax_print_attribute_standard_PrinterURI__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterURI;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterURI : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterURI(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7923912792485606497LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterURI__
diff --git a/libjava/javax/print/attribute/standard/QueuedJobCount.h b/libjava/javax/print/attribute/standard/QueuedJobCount.h
deleted file mode 100644
index d1b115466d3..00000000000
--- a/libjava/javax/print/attribute/standard/QueuedJobCount.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_QueuedJobCount__
-#define __javax_print_attribute_standard_QueuedJobCount__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class QueuedJobCount;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::QueuedJobCount : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  QueuedJobCount(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7499723077864047742LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_QueuedJobCount__
diff --git a/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h b/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h
deleted file mode 100644
index c0cdd6783ca..00000000000
--- a/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_ReferenceUriSchemesSupported__
-#define __javax_print_attribute_standard_ReferenceUriSchemesSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class ReferenceUriSchemesSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::ReferenceUriSchemesSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  ReferenceUriSchemesSupported(jint);
-public:
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -8989076942813442805LL;
-public:
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * FTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * HTTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * HTTPS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * GOPHER;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * NEWS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * NNTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * WAIS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * FILE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::ReferenceUriSchemesSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_ReferenceUriSchemesSupported__
diff --git a/libjava/javax/print/attribute/standard/RequestingUserName.h b/libjava/javax/print/attribute/standard/RequestingUserName.h
deleted file mode 100644
index f562e2616cb..00000000000
--- a/libjava/javax/print/attribute/standard/RequestingUserName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_RequestingUserName__
-#define __javax_print_attribute_standard_RequestingUserName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class RequestingUserName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::RequestingUserName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  RequestingUserName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2683049894310331454LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_RequestingUserName__
diff --git a/libjava/javax/print/attribute/standard/Severity.h b/libjava/javax/print/attribute/standard/Severity.h
deleted file mode 100644
index ea302530894..00000000000
--- a/libjava/javax/print/attribute/standard/Severity.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Severity__
-#define __javax_print_attribute_standard_Severity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Severity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Severity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Severity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 8781881462717925380LL;
-public:
-  static ::javax::print::attribute::standard::Severity * REPORT;
-  static ::javax::print::attribute::standard::Severity * WARNING;
-  static ::javax::print::attribute::standard::Severity * ERROR;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Severity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Severity__
diff --git a/libjava/javax/print/attribute/standard/SheetCollate.h b/libjava/javax/print/attribute/standard/SheetCollate.h
deleted file mode 100644
index 81d40cb60a5..00000000000
--- a/libjava/javax/print/attribute/standard/SheetCollate.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_SheetCollate__
-#define __javax_print_attribute_standard_SheetCollate__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class SheetCollate;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::SheetCollate : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  SheetCollate(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 7080587914259873003LL;
-public:
-  static ::javax::print::attribute::standard::SheetCollate * UNCOLLATED;
-  static ::javax::print::attribute::standard::SheetCollate * COLLATED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::SheetCollate * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_SheetCollate__
diff --git a/libjava/javax/print/attribute/standard/Sides.h b/libjava/javax/print/attribute/standard/Sides.h
deleted file mode 100644
index 9f3072bd8e2..00000000000
--- a/libjava/javax/print/attribute/standard/Sides.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Sides__
-#define __javax_print_attribute_standard_Sides__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Sides;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Sides : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Sides(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -6890309414893262822LL;
-public:
-  static ::javax::print::attribute::standard::Sides * ONE_SIDED;
-  static ::javax::print::attribute::standard::Sides * TWO_SIDED_LONG_EDGE;
-  static ::javax::print::attribute::standard::Sides * TWO_SIDED_SHORT_EDGE;
-  static ::javax::print::attribute::standard::Sides * DUPLEX;
-  static ::javax::print::attribute::standard::Sides * TUMBLE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Sides * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Sides__
diff --git a/libjava/javax/print/event/PrintEvent.h b/libjava/javax/print/event/PrintEvent.h
deleted file mode 100644
index e69675adf1c..00000000000
--- a/libjava/javax/print/event/PrintEvent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintEvent__
-#define __javax_print_event_PrintEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintEvent : public ::java::util::EventObject
-{
-
-public:
-  PrintEvent(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintEvent__
diff --git a/libjava/javax/print/event/PrintJobAdapter.h b/libjava/javax/print/event/PrintJobAdapter.h
deleted file mode 100644
index 2137f467dca..00000000000
--- a/libjava/javax/print/event/PrintJobAdapter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAdapter__
-#define __javax_print_event_PrintJobAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobAdapter;
-          class PrintJobEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAdapter : public ::java::lang::Object
-{
-
-public:
-  PrintJobAdapter();
-  virtual void printDataTransferCompleted(::javax::print::event::PrintJobEvent *);
-  virtual void printJobCanceled(::javax::print::event::PrintJobEvent *);
-  virtual void printJobCompleted(::javax::print::event::PrintJobEvent *);
-  virtual void printJobFailed(::javax::print::event::PrintJobEvent *);
-  virtual void printJobNoMoreEvents(::javax::print::event::PrintJobEvent *);
-  virtual void printJobRequiresAttention(::javax::print::event::PrintJobEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobAdapter__
diff --git a/libjava/javax/print/event/PrintJobAttributeEvent.h b/libjava/javax/print/event/PrintJobAttributeEvent.h
deleted file mode 100644
index d3fcc6c39f5..00000000000
--- a/libjava/javax/print/event/PrintJobAttributeEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAttributeEvent__
-#define __javax_print_event_PrintJobAttributeEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocPrintJob;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAttributeEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintJobAttributeEvent(::javax::print::DocPrintJob *, ::javax::print::attribute::PrintJobAttributeSet *);
-  virtual ::javax::print::DocPrintJob * getPrintJob();
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes();
-private:
-  static const jlong serialVersionUID = -6534469883874742101LL;
-  ::javax::print::attribute::PrintJobAttributeSet * __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobAttributeEvent__
diff --git a/libjava/javax/print/event/PrintJobAttributeListener.h b/libjava/javax/print/event/PrintJobAttributeListener.h
deleted file mode 100644
index 7b7581c4d5e..00000000000
--- a/libjava/javax/print/event/PrintJobAttributeListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAttributeListener__
-#define __javax_print_event_PrintJobAttributeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobAttributeEvent;
-          class PrintJobAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAttributeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void attributeUpdate(::javax::print::event::PrintJobAttributeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintJobAttributeListener__
diff --git a/libjava/javax/print/event/PrintJobEvent.h b/libjava/javax/print/event/PrintJobEvent.h
deleted file mode 100644
index a052e07d60f..00000000000
--- a/libjava/javax/print/event/PrintJobEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobEvent__
-#define __javax_print_event_PrintJobEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocPrintJob;
-      namespace event
-      {
-          class PrintJobEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintJobEvent(::javax::print::DocPrintJob *, jint);
-  virtual jint getPrintEventType();
-  virtual ::javax::print::DocPrintJob * getPrintJob();
-private:
-  static const jlong serialVersionUID = -1711656903622072997LL;
-public:
-  static const jint DATA_TRANSFER_COMPLETE = 106;
-  static const jint JOB_CANCELED = 101;
-  static const jint JOB_COMPLETE = 102;
-  static const jint JOB_FAILED = 103;
-  static const jint NO_MORE_EVENTS = 105;
-  static const jint REQUIRES_ATTENTION = 104;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) reason;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobEvent__
diff --git a/libjava/javax/print/event/PrintJobListener.h b/libjava/javax/print/event/PrintJobListener.h
deleted file mode 100644
index 2dbc20e4ca9..00000000000
--- a/libjava/javax/print/event/PrintJobListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobListener__
-#define __javax_print_event_PrintJobListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobEvent;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobListener : public ::java::lang::Object
-{
-
-public:
-  virtual void printDataTransferCompleted(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobCanceled(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobCompleted(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobFailed(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobNoMoreEvents(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobRequiresAttention(::javax::print::event::PrintJobEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintJobListener__
diff --git a/libjava/javax/print/event/PrintServiceAttributeEvent.h b/libjava/javax/print/event/PrintServiceAttributeEvent.h
deleted file mode 100644
index baceddb9a4c..00000000000
--- a/libjava/javax/print/event/PrintServiceAttributeEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintServiceAttributeEvent__
-#define __javax_print_event_PrintServiceAttributeEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class PrintService;
-      namespace attribute
-      {
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintServiceAttributeEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintServiceAttributeEvent(::javax::print::PrintService *, ::javax::print::attribute::PrintServiceAttributeSet *);
-  virtual ::javax::print::PrintService * getPrintService();
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes();
-private:
-  ::javax::print::attribute::PrintServiceAttributeSet * __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintServiceAttributeEvent__
diff --git a/libjava/javax/print/event/PrintServiceAttributeListener.h b/libjava/javax/print/event/PrintServiceAttributeListener.h
deleted file mode 100644
index 95b52368563..00000000000
--- a/libjava/javax/print/event/PrintServiceAttributeListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintServiceAttributeListener__
-#define __javax_print_event_PrintServiceAttributeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintServiceAttributeEvent;
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintServiceAttributeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void attributeUpdate(::javax::print::event::PrintServiceAttributeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintServiceAttributeListener__
diff --git a/libjava/javax/rmi/CORBA/ClassDesc.h b/libjava/javax/rmi/CORBA/ClassDesc.h
deleted file mode 100644
index 39d37b95175..00000000000
--- a/libjava/javax/rmi/CORBA/ClassDesc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_ClassDesc__
-#define __javax_rmi_CORBA_ClassDesc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class ClassDesc;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::ClassDesc : public ::java::lang::Object
-{
-
-public:
-  ClassDesc();
-private:
-  static const jlong serialVersionUID = -3477057297839810709LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) repid;
-  ::java::lang::String * codebase;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_CORBA_ClassDesc__
diff --git a/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.h b/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.h
deleted file mode 100644
index 2e3c72dcaaa..00000000000
--- a/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_PortableRemoteObjectDelegate__
-#define __javax_rmi_CORBA_PortableRemoteObjectDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class PortableRemoteObjectDelegate;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::PortableRemoteObjectDelegate : public ::java::lang::Object
-{
-
-public:
-  virtual void connect(::java::rmi::Remote *, ::java::rmi::Remote *) = 0;
-  virtual void exportObject(::java::rmi::Remote *) = 0;
-  virtual ::java::lang::Object * narrow(::java::lang::Object *, ::java::lang::Class *) = 0;
-  virtual ::java::rmi::Remote * toStub(::java::rmi::Remote *) = 0;
-  virtual void unexportObject(::java::rmi::Remote *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_PortableRemoteObjectDelegate__
diff --git a/libjava/javax/rmi/CORBA/Stub.h b/libjava/javax/rmi/CORBA/Stub.h
deleted file mode 100644
index d87f63d0d6d..00000000000
--- a/libjava/javax/rmi/CORBA/Stub.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_Stub__
-#define __javax_rmi_CORBA_Stub__
-
-#pragma interface
-
-#include <org/omg/CORBA_2_3/portable/ObjectImpl.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class StubDelegate;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::Stub : public ::org::omg::CORBA_2_3::portable::ObjectImpl
-{
-
-public:
-  Stub();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual void connect(::org::omg::CORBA::ORB *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 1087775603798577179LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::org::omg::CORBA_2_3::portable::ObjectImpl)))) m_hash;
-  ::java::lang::String * m_ior;
-  ::org::omg::CORBA::ORB * m_orb;
-  static ::javax::rmi::CORBA::StubDelegate * delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_CORBA_Stub__
diff --git a/libjava/javax/rmi/CORBA/StubDelegate.h b/libjava/javax/rmi/CORBA/StubDelegate.h
deleted file mode 100644
index c8dc436221f..00000000000
--- a/libjava/javax/rmi/CORBA/StubDelegate.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_StubDelegate__
-#define __javax_rmi_CORBA_StubDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class StubDelegate;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::StubDelegate : public ::java::lang::Object
-{
-
-public:
-  virtual void connect(::javax::rmi::CORBA::Stub *, ::org::omg::CORBA::ORB *) = 0;
-  virtual jboolean equals(::javax::rmi::CORBA::Stub *, ::java::lang::Object *) = 0;
-  virtual jint hashCode(::javax::rmi::CORBA::Stub *) = 0;
-  virtual void readObject(::javax::rmi::CORBA::Stub *, ::java::io::ObjectInputStream *) = 0;
-  virtual void writeObject(::javax::rmi::CORBA::Stub *, ::java::io::ObjectOutputStream *) = 0;
-  virtual ::java::lang::String * toString(::javax::rmi::CORBA::Stub *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_StubDelegate__
diff --git a/libjava/javax/rmi/CORBA/Tie.h b/libjava/javax/rmi/CORBA/Tie.h
deleted file mode 100644
index 9f9ffcf1ba7..00000000000
--- a/libjava/javax/rmi/CORBA/Tie.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_Tie__
-#define __javax_rmi_CORBA_Tie__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Tie;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::Tie : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::Remote * getTarget() = 0;
-  virtual void setTarget(::java::rmi::Remote *) = 0;
-  virtual ::org::omg::CORBA::ORB * orb() = 0;
-  virtual void orb(::org::omg::CORBA::ORB *) = 0;
-  virtual ::org::omg::CORBA::Object * thisObject() = 0;
-  virtual void deactivate() = 0;
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_Tie__
diff --git a/libjava/javax/rmi/CORBA/Util.h b/libjava/javax/rmi/CORBA/Util.h
deleted file mode 100644
index a7eaf610411..00000000000
--- a/libjava/javax/rmi/CORBA/Util.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_Util__
-#define __javax_rmi_CORBA_Util__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-        class RemoteException;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class Tie;
-          class Util;
-          class UtilDelegate;
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class SystemException;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::Util : public ::java::lang::Object
-{
-
-  Util();
-public:
-  static ::java::lang::Object * copyObject(::java::lang::Object *, ::org::omg::CORBA::ORB *);
-  static JArray< ::java::lang::Object * > * copyObjects(JArray< ::java::lang::Object * > *, ::org::omg::CORBA::ORB *);
-  static ::javax::rmi::CORBA::ValueHandler * createValueHandler();
-  static ::java::lang::String * getCodebase(::java::lang::Class *);
-  static ::javax::rmi::CORBA::Tie * getTie(::java::rmi::Remote *);
-  static jboolean isLocal(::javax::rmi::CORBA::Stub *);
-  static ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  static ::java::rmi::RemoteException * mapSystemException(::org::omg::CORBA::SystemException *);
-  static void registerTarget(::javax::rmi::CORBA::Tie *, ::java::rmi::Remote *);
-  static void unexportObject(::java::rmi::Remote *);
-  static ::java::rmi::RemoteException * wrapException(::java::lang::Throwable *);
-  static void writeAbstractObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-  static void writeAny(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-  static ::java::lang::Object * readAny(::org::omg::CORBA::portable::InputStream *);
-  static void writeRemoteObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-public: // actually package-private
-  static ::javax::rmi::CORBA::UtilDelegate * delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_CORBA_Util__
diff --git a/libjava/javax/rmi/CORBA/UtilDelegate.h b/libjava/javax/rmi/CORBA/UtilDelegate.h
deleted file mode 100644
index e3c235d92ef..00000000000
--- a/libjava/javax/rmi/CORBA/UtilDelegate.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_UtilDelegate__
-#define __javax_rmi_CORBA_UtilDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-        class RemoteException;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class Tie;
-          class UtilDelegate;
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class SystemException;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::UtilDelegate : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * copyObject(::java::lang::Object *, ::org::omg::CORBA::ORB *) = 0;
-  virtual JArray< ::java::lang::Object * > * copyObjects(JArray< ::java::lang::Object * > *, ::org::omg::CORBA::ORB *) = 0;
-  virtual ::javax::rmi::CORBA::ValueHandler * createValueHandler() = 0;
-  virtual ::java::lang::String * getCodebase(::java::lang::Class *) = 0;
-  virtual jboolean isLocal(::javax::rmi::CORBA::Stub *) = 0;
-  virtual ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *) = 0;
-  virtual ::java::rmi::RemoteException * mapSystemException(::org::omg::CORBA::SystemException *) = 0;
-  virtual ::javax::rmi::CORBA::Tie * getTie(::java::rmi::Remote *) = 0;
-  virtual void registerTarget(::javax::rmi::CORBA::Tie *, ::java::rmi::Remote *) = 0;
-  virtual void unexportObject(::java::rmi::Remote *) = 0;
-  virtual ::java::rmi::RemoteException * wrapException(::java::lang::Throwable *) = 0;
-  virtual void writeRemoteObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *) = 0;
-  virtual void writeAbstractObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *) = 0;
-  virtual void writeAny(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * readAny(::org::omg::CORBA::portable::InputStream *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_UtilDelegate__
diff --git a/libjava/javax/rmi/CORBA/ValueHandler.h b/libjava/javax/rmi/CORBA/ValueHandler.h
deleted file mode 100644
index 170f4d593b8..00000000000
--- a/libjava/javax/rmi/CORBA/ValueHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_ValueHandler__
-#define __javax_rmi_CORBA_ValueHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace SendingContext
-      {
-          class RunTime;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::ValueHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getRMIRepositoryID(::java::lang::Class *) = 0;
-  virtual ::org::omg::SendingContext::RunTime * getRunTimeCodeBase() = 0;
-  virtual jboolean isCustomMarshaled(::java::lang::Class *) = 0;
-  virtual ::java::io::Serializable * readValue(::org::omg::CORBA::portable::InputStream *, jint, ::java::lang::Class *, ::java::lang::String *, ::org::omg::SendingContext::RunTime *) = 0;
-  virtual ::java::io::Serializable * writeReplace(::java::io::Serializable *) = 0;
-  virtual void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_ValueHandler__
diff --git a/libjava/javax/rmi/CORBA/ValueHandlerMultiFormat.h b/libjava/javax/rmi/CORBA/ValueHandlerMultiFormat.h
deleted file mode 100644
index 7e59a61f40d..00000000000
--- a/libjava/javax/rmi/CORBA/ValueHandlerMultiFormat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_ValueHandlerMultiFormat__
-#define __javax_rmi_CORBA_ValueHandlerMultiFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class ValueHandlerMultiFormat;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace SendingContext
-      {
-          class RunTime;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::ValueHandlerMultiFormat : public ::java::lang::Object
-{
-
-public:
-  virtual jbyte getMaximumStreamFormatVersion() = 0;
-  virtual void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, jbyte) = 0;
-  virtual ::java::lang::String * getRMIRepositoryID(::java::lang::Class *) = 0;
-  virtual ::org::omg::SendingContext::RunTime * getRunTimeCodeBase() = 0;
-  virtual jboolean isCustomMarshaled(::java::lang::Class *) = 0;
-  virtual ::java::io::Serializable * readValue(::org::omg::CORBA::portable::InputStream *, jint, ::java::lang::Class *, ::java::lang::String *, ::org::omg::SendingContext::RunTime *) = 0;
-  virtual ::java::io::Serializable * writeReplace(::java::io::Serializable *) = 0;
-  virtual void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_ValueHandlerMultiFormat__
diff --git a/libjava/javax/rmi/PortableRemoteObject.h b/libjava/javax/rmi/PortableRemoteObject.h
deleted file mode 100644
index 2fd0facd270..00000000000
--- a/libjava/javax/rmi/PortableRemoteObject.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_PortableRemoteObject__
-#define __javax_rmi_PortableRemoteObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class PortableRemoteObjectDelegate;
-      }
-        class PortableRemoteObject;
-    }
-  }
-}
-
-class javax::rmi::PortableRemoteObject : public ::java::lang::Object
-{
-
-public: // actually protected
-  PortableRemoteObject();
-public:
-  static void connect(::java::rmi::Remote *, ::java::rmi::Remote *);
-  static void exportObject(::java::rmi::Remote *);
-  static ::java::lang::Object * narrow(::java::lang::Object *, ::java::lang::Class *);
-  static ::java::rmi::Remote * toStub(::java::rmi::Remote *);
-  static void unexportObject(::java::rmi::Remote *);
-public: // actually package-private
-  static ::javax::rmi::CORBA::PortableRemoteObjectDelegate * delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_PortableRemoteObject__
diff --git a/libjava/javax/rmi/ssl/SslRMIClientSocketFactory.h b/libjava/javax/rmi/ssl/SslRMIClientSocketFactory.h
deleted file mode 100644
index 8c54dd83066..00000000000
--- a/libjava/javax/rmi/ssl/SslRMIClientSocketFactory.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_ssl_SslRMIClientSocketFactory__
-#define __javax_rmi_ssl_SslRMIClientSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSocketFactory;
-      }
-    }
-    namespace rmi
-    {
-      namespace ssl
-      {
-          class SslRMIClientSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::rmi::ssl::SslRMIClientSocketFactory : public ::java::lang::Object
-{
-
-public:
-  SslRMIClientSocketFactory();
-private:
-  JArray< ::java::lang::String * > * getProp(::java::lang::String *);
-public:
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = -8310631444933958385LL;
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabledCipherSuites;
-  JArray< ::java::lang::String * > * enabledProtocols;
-  static ::javax::net::ssl::SSLSocketFactory * socketFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_ssl_SslRMIClientSocketFactory__
diff --git a/libjava/javax/rmi/ssl/SslRMIServerSocketFactory.h b/libjava/javax/rmi/ssl/SslRMIServerSocketFactory.h
deleted file mode 100644
index 3b49d3e9ede..00000000000
--- a/libjava/javax/rmi/ssl/SslRMIServerSocketFactory.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_ssl_SslRMIServerSocketFactory__
-#define __javax_rmi_ssl_SslRMIServerSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLServerSocketFactory;
-      }
-    }
-    namespace rmi
-    {
-      namespace ssl
-      {
-          class SslRMIServerSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::rmi::ssl::SslRMIServerSocketFactory : public ::java::lang::Object
-{
-
-public:
-  SslRMIServerSocketFactory();
-  SslRMIServerSocketFactory(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean);
-  virtual ::java::net::ServerSocket * createServerSocket(jint);
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  static jboolean cmpStrArray(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-public:
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites();
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols();
-  virtual jboolean getNeedClientAuth();
-  virtual jint hashCode();
-private:
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabledCipherSuites;
-  JArray< ::java::lang::String * > * enabledProtocols;
-  jboolean needClientAuth;
-  static ::javax::net::ssl::SSLServerSocketFactory * socketFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_ssl_SslRMIServerSocketFactory__
diff --git a/libjava/javax/security/auth/AuthPermission.h b/libjava/javax/security/auth/AuthPermission.h
deleted file mode 100644
index 7be18bde9e1..00000000000
--- a/libjava/javax/security/auth/AuthPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_AuthPermission__
-#define __javax_security_auth_AuthPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class AuthPermission;
-      }
-    }
-  }
-}
-
-class javax::security::auth::AuthPermission : public ::java::security::BasicPermission
-{
-
-public:
-  AuthPermission(::java::lang::String *);
-  AuthPermission(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_AuthPermission__
diff --git a/libjava/javax/security/auth/DestroyFailedException.h b/libjava/javax/security/auth/DestroyFailedException.h
deleted file mode 100644
index 7ee0fb6a29c..00000000000
--- a/libjava/javax/security/auth/DestroyFailedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_DestroyFailedException__
-#define __javax_security_auth_DestroyFailedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class DestroyFailedException;
-      }
-    }
-  }
-}
-
-class javax::security::auth::DestroyFailedException : public ::java::lang::Exception
-{
-
-public:
-  DestroyFailedException();
-  DestroyFailedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_DestroyFailedException__
diff --git a/libjava/javax/security/auth/Destroyable.h b/libjava/javax/security/auth/Destroyable.h
deleted file mode 100644
index 3afdb762f8e..00000000000
--- a/libjava/javax/security/auth/Destroyable.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Destroyable__
-#define __javax_security_auth_Destroyable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Destroyable;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Destroyable : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual jboolean isDestroyed() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_Destroyable__
diff --git a/libjava/javax/security/auth/Policy.h b/libjava/javax/security/auth/Policy.h
deleted file mode 100644
index 394a870d686..00000000000
--- a/libjava/javax/security/auth/Policy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Policy__
-#define __javax_security_auth_Policy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class CodeSource;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Policy;
-          class Subject;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Policy : public ::java::lang::Object
-{
-
-public: // actually protected
-  Policy();
-public:
-  static ::javax::security::auth::Policy * getPolicy();
-  static void setPolicy(::javax::security::auth::Policy *);
-  virtual ::java::security::PermissionCollection * getPermissions(::javax::security::auth::Subject *, ::java::security::CodeSource *) = 0;
-  virtual void refresh() = 0;
-private:
-  static ::javax::security::auth::Policy * policy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_Policy__
diff --git a/libjava/javax/security/auth/PrivateCredentialPermission$CredOwner.h b/libjava/javax/security/auth/PrivateCredentialPermission$CredOwner.h
deleted file mode 100644
index c877eddd1f5..00000000000
--- a/libjava/javax/security/auth/PrivateCredentialPermission$CredOwner.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_PrivateCredentialPermission$CredOwner__
-#define __javax_security_auth_PrivateCredentialPermission$CredOwner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class PrivateCredentialPermission$CredOwner;
-      }
-    }
-  }
-}
-
-class javax::security::auth::PrivateCredentialPermission$CredOwner : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PrivateCredentialPermission$CredOwner(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getPrincipalClass();
-  virtual ::java::lang::String * getPrincipalName();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) principalClass;
-  ::java::lang::String * principalName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_PrivateCredentialPermission$CredOwner__
diff --git a/libjava/javax/security/auth/PrivateCredentialPermission.h b/libjava/javax/security/auth/PrivateCredentialPermission.h
deleted file mode 100644
index 157c1df79ce..00000000000
--- a/libjava/javax/security/auth/PrivateCredentialPermission.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_PrivateCredentialPermission__
-#define __javax_security_auth_PrivateCredentialPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class PrivateCredentialPermission;
-      }
-    }
-  }
-}
-
-class javax::security::auth::PrivateCredentialPermission : public ::java::security::Permission
-{
-
-public:
-  PrivateCredentialPermission(::java::lang::String *, ::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * getActions();
-  ::java::lang::String * getCredentialClass();
-  JArray< JArray< ::java::lang::String * > * > * getPrincipals();
-  jint hashCode();
-  jboolean implies(::java::security::Permission *);
-  ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static const jlong serialVersionUID = 5284372143517237068LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::Permission)))) credentialClass;
-  ::java::util::Set * principals;
-  jboolean testing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_PrivateCredentialPermission__
diff --git a/libjava/javax/security/auth/RefreshFailedException.h b/libjava/javax/security/auth/RefreshFailedException.h
deleted file mode 100644
index c0fadb08d54..00000000000
--- a/libjava/javax/security/auth/RefreshFailedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_RefreshFailedException__
-#define __javax_security_auth_RefreshFailedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class RefreshFailedException;
-      }
-    }
-  }
-}
-
-class javax::security::auth::RefreshFailedException : public ::java::lang::Exception
-{
-
-public:
-  RefreshFailedException();
-  RefreshFailedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_RefreshFailedException__
diff --git a/libjava/javax/security/auth/Refreshable.h b/libjava/javax/security/auth/Refreshable.h
deleted file mode 100644
index 5c065c5aa9c..00000000000
--- a/libjava/javax/security/auth/Refreshable.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Refreshable__
-#define __javax_security_auth_Refreshable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Refreshable;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Refreshable : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isCurrent() = 0;
-  virtual void refresh() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_Refreshable__
diff --git a/libjava/javax/security/auth/Subject$SecureSet.h b/libjava/javax/security/auth/Subject$SecureSet.h
deleted file mode 100644
index 854176ce9cb..00000000000
--- a/libjava/javax/security/auth/Subject$SecureSet.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Subject$SecureSet__
-#define __javax_security_auth_Subject$SecureSet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-          class Subject$SecureSet;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Subject$SecureSet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  Subject$SecureSet(::javax::security::auth::Subject *, jint, ::java::util::Collection *);
-  Subject$SecureSet(::javax::security::auth::Subject *, jint);
-public:
-  virtual jint size();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual void clear();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 7911754171111800359LL;
-public: // actually package-private
-  static const jint PRINCIPALS = 0;
-  static const jint PUBLIC_CREDENTIALS = 1;
-  static const jint PRIVATE_CREDENTIALS = 2;
-private:
-  ::javax::security::auth::Subject * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) subject;
-  ::java::util::LinkedList * elements;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_Subject$SecureSet__
diff --git a/libjava/javax/security/auth/Subject.h b/libjava/javax/security/auth/Subject.h
deleted file mode 100644
index de9165199ba..00000000000
--- a/libjava/javax/security/auth/Subject.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Subject__
-#define __javax_security_auth_Subject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-        class PrivilegedAction;
-        class PrivilegedExceptionAction;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-          class Subject$SecureSet;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Subject : public ::java::lang::Object
-{
-
-public:
-  Subject();
-  Subject(jboolean, ::java::util::Set *, ::java::util::Set *, ::java::util::Set *);
-  static ::javax::security::auth::Subject * getSubject(::java::security::AccessControlContext *);
-  static ::java::lang::Object * doAs(::javax::security::auth::Subject *, ::java::security::PrivilegedAction *);
-  static ::java::lang::Object * doAs(::javax::security::auth::Subject *, ::java::security::PrivilegedExceptionAction *);
-  static ::java::lang::Object * doAsPrivileged(::javax::security::auth::Subject *, ::java::security::PrivilegedAction *, ::java::security::AccessControlContext *);
-  static ::java::lang::Object * doAsPrivileged(::javax::security::auth::Subject *, ::java::security::PrivilegedExceptionAction *, ::java::security::AccessControlContext *);
-  jboolean equals(::java::lang::Object *);
-  ::java::util::Set * getPrincipals();
-  ::java::util::Set * getPrincipals(::java::lang::Class *);
-  ::java::util::Set * getPrivateCredentials();
-  ::java::util::Set * getPrivateCredentials(::java::lang::Class *);
-  ::java::util::Set * getPublicCredentials();
-  ::java::util::Set * getPublicCredentials(::java::lang::Class *);
-  jint hashCode();
-  jboolean isReadOnly();
-  void setReadOnly();
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -8308522755600156056LL;
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) principals;
-  jboolean readOnly;
-  ::javax::security::auth::Subject$SecureSet * pubCred;
-  ::javax::security::auth::Subject$SecureSet * privCred;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_Subject__
diff --git a/libjava/javax/security/auth/SubjectDomainCombiner.h b/libjava/javax/security/auth/SubjectDomainCombiner.h
deleted file mode 100644
index bda871c92db..00000000000
--- a/libjava/javax/security/auth/SubjectDomainCombiner.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_SubjectDomainCombiner__
-#define __javax_security_auth_SubjectDomainCombiner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class ProtectionDomain;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-          class SubjectDomainCombiner;
-      }
-    }
-  }
-}
-
-class javax::security::auth::SubjectDomainCombiner : public ::java::lang::Object
-{
-
-public:
-  SubjectDomainCombiner(::javax::security::auth::Subject *);
-  virtual JArray< ::java::security::ProtectionDomain * > * combine(JArray< ::java::security::ProtectionDomain * > *, JArray< ::java::security::ProtectionDomain * > *);
-  virtual ::javax::security::auth::Subject * getSubject();
-private:
-  ::javax::security::auth::Subject * __attribute__((aligned(__alignof__( ::java::lang::Object)))) subject;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_SubjectDomainCombiner__
diff --git a/libjava/javax/security/auth/callback/Callback.h b/libjava/javax/security/auth/callback/Callback.h
deleted file mode 100644
index ef069f63367..00000000000
--- a/libjava/javax/security/auth/callback/Callback.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_Callback__
-#define __javax_security_auth_callback_Callback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class Callback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::Callback : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_callback_Callback__
diff --git a/libjava/javax/security/auth/callback/CallbackHandler.h b/libjava/javax/security/auth/callback/CallbackHandler.h
deleted file mode 100644
index 63f4bfb4164..00000000000
--- a/libjava/javax/security/auth/callback/CallbackHandler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_CallbackHandler__
-#define __javax_security_auth_callback_CallbackHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class Callback;
-            class CallbackHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::CallbackHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void handle(JArray< ::javax::security::auth::callback::Callback * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_callback_CallbackHandler__
diff --git a/libjava/javax/security/auth/callback/ChoiceCallback.h b/libjava/javax/security/auth/callback/ChoiceCallback.h
deleted file mode 100644
index 80f4ccf2879..00000000000
--- a/libjava/javax/security/auth/callback/ChoiceCallback.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_ChoiceCallback__
-#define __javax_security_auth_callback_ChoiceCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ChoiceCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::ChoiceCallback : public ::java::lang::Object
-{
-
-public:
-  ChoiceCallback(::java::lang::String *, JArray< ::java::lang::String * > *, jint, jboolean);
-  virtual ::java::lang::String * getPrompt();
-  virtual JArray< ::java::lang::String * > * getChoices();
-  virtual jint getDefaultChoice();
-  virtual jboolean allowMultipleSelections();
-  virtual void setSelectedIndex(jint);
-  virtual void setSelectedIndexes(JArray< jint > *);
-  virtual JArray< jint > * getSelectedIndexes();
-private:
-  void setPrompt(::java::lang::String *);
-  void setChoices(JArray< ::java::lang::String * > *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  JArray< ::java::lang::String * > * choices;
-  jint defaultChoice;
-  jboolean multipleSelectionsAllowed;
-  JArray< jint > * selections;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_ChoiceCallback__
diff --git a/libjava/javax/security/auth/callback/ConfirmationCallback.h b/libjava/javax/security/auth/callback/ConfirmationCallback.h
deleted file mode 100644
index 4e7443832a7..00000000000
--- a/libjava/javax/security/auth/callback/ConfirmationCallback.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_ConfirmationCallback__
-#define __javax_security_auth_callback_ConfirmationCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ConfirmationCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::ConfirmationCallback : public ::java::lang::Object
-{
-
-public:
-  ConfirmationCallback(jint, jint, jint);
-  ConfirmationCallback(jint, JArray< ::java::lang::String * > *, jint);
-  ConfirmationCallback(::java::lang::String *, jint, jint, jint);
-  ConfirmationCallback(::java::lang::String *, jint, JArray< ::java::lang::String * > *, jint);
-  virtual ::java::lang::String * getPrompt();
-  virtual jint getMessageType();
-  virtual jint getOptionType();
-  virtual JArray< ::java::lang::String * > * getOptions();
-  virtual jint getDefaultOption();
-  virtual void setSelectedIndex(jint);
-  virtual jint getSelectedIndex();
-private:
-  void setMessageType(jint);
-  void setOptionType(jint, jint);
-  void setOptions(JArray< ::java::lang::String * > *, jint);
-  void setPrompt(::java::lang::String *);
-public:
-  static const jint UNSPECIFIED_OPTION = -1;
-  static const jint YES_NO_OPTION = 0;
-  static const jint YES_NO_CANCEL_OPTION = 1;
-  static const jint OK_CANCEL_OPTION = 2;
-  static const jint YES = 0;
-  static const jint NO = 1;
-  static const jint CANCEL = 2;
-  static const jint OK = 3;
-  static const jint INFORMATION = 0;
-  static const jint WARNING = 1;
-  static const jint ERROR = 2;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  jint messageType;
-  jint optionType;
-  jint defaultOption;
-  JArray< ::java::lang::String * > * options;
-  jint selection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_ConfirmationCallback__
diff --git a/libjava/javax/security/auth/callback/LanguageCallback.h b/libjava/javax/security/auth/callback/LanguageCallback.h
deleted file mode 100644
index 8580fa7a847..00000000000
--- a/libjava/javax/security/auth/callback/LanguageCallback.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_LanguageCallback__
-#define __javax_security_auth_callback_LanguageCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class LanguageCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::LanguageCallback : public ::java::lang::Object
-{
-
-public:
-  LanguageCallback();
-  virtual void setLocale(::java::util::Locale *);
-  virtual ::java::util::Locale * getLocale();
-private:
-  ::java::util::Locale * __attribute__((aligned(__alignof__( ::java::lang::Object)))) locale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_LanguageCallback__
diff --git a/libjava/javax/security/auth/callback/NameCallback.h b/libjava/javax/security/auth/callback/NameCallback.h
deleted file mode 100644
index 89e3ffdbce4..00000000000
--- a/libjava/javax/security/auth/callback/NameCallback.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_NameCallback__
-#define __javax_security_auth_callback_NameCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class NameCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::NameCallback : public ::java::lang::Object
-{
-
-public:
-  NameCallback(::java::lang::String *);
-  NameCallback(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getPrompt();
-  virtual ::java::lang::String * getDefaultName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-private:
-  void setPrompt(::java::lang::String *);
-  void setDefaultName(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  ::java::lang::String * defaultName;
-  ::java::lang::String * inputName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_NameCallback__
diff --git a/libjava/javax/security/auth/callback/PasswordCallback.h b/libjava/javax/security/auth/callback/PasswordCallback.h
deleted file mode 100644
index 2055b7cc65e..00000000000
--- a/libjava/javax/security/auth/callback/PasswordCallback.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_PasswordCallback__
-#define __javax_security_auth_callback_PasswordCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class PasswordCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::PasswordCallback : public ::java::lang::Object
-{
-
-public:
-  PasswordCallback(::java::lang::String *, jboolean);
-  virtual ::java::lang::String * getPrompt();
-  virtual jboolean isEchoOn();
-  virtual void setPassword(JArray< jchar > *);
-  virtual JArray< jchar > * getPassword();
-  virtual void clearPassword();
-private:
-  void setPrompt(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  jboolean echoOn;
-  JArray< jchar > * inputPassword;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_PasswordCallback__
diff --git a/libjava/javax/security/auth/callback/TextInputCallback.h b/libjava/javax/security/auth/callback/TextInputCallback.h
deleted file mode 100644
index bf85c3544db..00000000000
--- a/libjava/javax/security/auth/callback/TextInputCallback.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_TextInputCallback__
-#define __javax_security_auth_callback_TextInputCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class TextInputCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::TextInputCallback : public ::java::lang::Object
-{
-
-public:
-  TextInputCallback(::java::lang::String *);
-  TextInputCallback(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getPrompt();
-  virtual ::java::lang::String * getDefaultText();
-  virtual void setText(::java::lang::String *);
-  virtual ::java::lang::String * getText();
-private:
-  void setPrompt(::java::lang::String *);
-  void setDefaultText(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  ::java::lang::String * defaultText;
-  ::java::lang::String * inputText;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_TextInputCallback__
diff --git a/libjava/javax/security/auth/callback/TextOutputCallback.h b/libjava/javax/security/auth/callback/TextOutputCallback.h
deleted file mode 100644
index 048e8cf83e2..00000000000
--- a/libjava/javax/security/auth/callback/TextOutputCallback.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_TextOutputCallback__
-#define __javax_security_auth_callback_TextOutputCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class TextOutputCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::TextOutputCallback : public ::java::lang::Object
-{
-
-public:
-  TextOutputCallback(jint, ::java::lang::String *);
-  virtual jint getMessageType();
-  virtual ::java::lang::String * getMessage();
-private:
-  void setMessage(::java::lang::String *);
-public:
-  static const jint INFORMATION = 0;
-  static const jint WARNING = 1;
-  static const jint ERROR = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) messageType;
-  ::java::lang::String * message;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_TextOutputCallback__
diff --git a/libjava/javax/security/auth/callback/UnsupportedCallbackException.h b/libjava/javax/security/auth/callback/UnsupportedCallbackException.h
deleted file mode 100644
index ec80fddcb56..00000000000
--- a/libjava/javax/security/auth/callback/UnsupportedCallbackException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_UnsupportedCallbackException__
-#define __javax_security_auth_callback_UnsupportedCallbackException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class Callback;
-            class UnsupportedCallbackException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::UnsupportedCallbackException : public ::java::lang::Exception
-{
-
-public:
-  UnsupportedCallbackException(::javax::security::auth::callback::Callback *);
-  UnsupportedCallbackException(::javax::security::auth::callback::Callback *, ::java::lang::String *);
-  virtual ::javax::security::auth::callback::Callback * getCallback();
-private:
-  ::javax::security::auth::callback::Callback * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) callback;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_UnsupportedCallbackException__
diff --git a/libjava/javax/security/auth/kerberos/DelegationPermission$1.h b/libjava/javax/security/auth/kerberos/DelegationPermission$1.h
deleted file mode 100644
index 5a378b08e03..00000000000
--- a/libjava/javax/security/auth/kerberos/DelegationPermission$1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_DelegationPermission$1__
-#define __javax_security_auth_kerberos_DelegationPermission$1__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class DelegationPermission;
-            class DelegationPermission$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::DelegationPermission$1 : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  DelegationPermission$1(::javax::security::auth::kerberos::DelegationPermission *);
-public:
-  virtual void add(::java::security::Permission *);
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::util::Enumeration * elements();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-public: // actually package-private
-  ::javax::security::auth::kerberos::DelegationPermission * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_DelegationPermission$1__
diff --git a/libjava/javax/security/auth/kerberos/DelegationPermission.h b/libjava/javax/security/auth/kerberos/DelegationPermission.h
deleted file mode 100644
index 2b89ad70095..00000000000
--- a/libjava/javax/security/auth/kerberos/DelegationPermission.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_DelegationPermission__
-#define __javax_security_auth_kerberos_DelegationPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class DelegationPermission;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::DelegationPermission : public ::java::security::BasicPermission
-{
-
-public:
-  DelegationPermission(::java::lang::String *);
-  DelegationPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static void checkSyntax(::java::lang::String *);
-public:
-  jboolean implies(::java::security::Permission *);
-  ::java::security::PermissionCollection * newPermissionCollection();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_DelegationPermission__
diff --git a/libjava/javax/security/auth/kerberos/KerberosKey.h b/libjava/javax/security/auth/kerberos/KerberosKey.h
deleted file mode 100644
index ed0e93f2910..00000000000
--- a/libjava/javax/security/auth/kerberos/KerberosKey.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_KerberosKey__
-#define __javax_security_auth_kerberos_KerberosKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class KerberosKey;
-            class KerberosPrincipal;
-            class KeyImpl;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::KerberosKey : public ::java::lang::Object
-{
-
-public:
-  KerberosKey(::javax::security::auth::kerberos::KerberosPrincipal *, JArray< jbyte > *, jint, jint);
-  KerberosKey(::javax::security::auth::kerberos::KerberosPrincipal *, JArray< jchar > *, ::java::lang::String *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * getFormat();
-  virtual ::javax::security::auth::kerberos::KerberosPrincipal * getPrincipal();
-  virtual jint getKeyType();
-  virtual jint getVersionNumber();
-  virtual JArray< jbyte > * getEncoded();
-  virtual void destroy();
-  virtual jboolean isDestroyed();
-private:
-  void checkDestroyed();
-public:
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -4625402278148246993LL;
-  ::javax::security::auth::kerberos::KerberosPrincipal * __attribute__((aligned(__alignof__( ::java::lang::Object)))) principal;
-  jint versionNum;
-  ::javax::security::auth::kerberos::KeyImpl * key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_KerberosKey__
diff --git a/libjava/javax/security/auth/kerberos/KerberosPrincipal.h b/libjava/javax/security/auth/kerberos/KerberosPrincipal.h
deleted file mode 100644
index c945a5620e3..00000000000
--- a/libjava/javax/security/auth/kerberos/KerberosPrincipal.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_KerberosPrincipal__
-#define __javax_security_auth_kerberos_KerberosPrincipal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class KerberosPrincipal;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::KerberosPrincipal : public ::java::lang::Object
-{
-
-public:
-  KerberosPrincipal(::java::lang::String *);
-  KerberosPrincipal(::java::lang::String *, jint);
-private:
-  ::java::lang::String * parseRealm();
-public:
-  ::java::lang::String * getName();
-  ::java::lang::String * getRealm();
-  jint getNameType();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * toString();
-  static const jint KRB_NT_PRINCIPAL = 1;
-  static const jint KRB_NT_SRV_HST = 3;
-  static const jint KRB_NT_SRV_INST = 2;
-  static const jint KRB_NT_SRV_XHST = 4;
-  static const jint KRB_NT_UID = 5;
-  static const jint KRB_NT_UNKNOWN = 0;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint type;
-  ::java::lang::String * realm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_KerberosPrincipal__
diff --git a/libjava/javax/security/auth/kerberos/KerberosTicket.h b/libjava/javax/security/auth/kerberos/KerberosTicket.h
deleted file mode 100644
index d92309354c2..00000000000
--- a/libjava/javax/security/auth/kerberos/KerberosTicket.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_KerberosTicket__
-#define __javax_security_auth_kerberos_KerberosTicket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class KerberosPrincipal;
-            class KerberosTicket;
-            class KeyImpl;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::KerberosTicket : public ::java::lang::Object
-{
-
-public:
-  KerberosTicket(JArray< jbyte > *, ::javax::security::auth::kerberos::KerberosPrincipal *, ::javax::security::auth::kerberos::KerberosPrincipal *, JArray< jbyte > *, jint, JArray< jboolean > *, ::java::util::Date *, ::java::util::Date *, ::java::util::Date *, ::java::util::Date *, JArray< ::java::net::InetAddress * > *);
-  virtual void destroy();
-  virtual jboolean isDestroyed();
-  virtual jboolean isCurrent();
-  virtual void refresh();
-  virtual ::javax::security::auth::kerberos::KerberosPrincipal * getClient();
-  virtual ::javax::security::auth::kerberos::KerberosPrincipal * getServer();
-  virtual jboolean isForwardable();
-  virtual jboolean isForwarded();
-  virtual jboolean isProxiable();
-  virtual jboolean isProxy();
-  virtual jboolean isPostdated();
-  virtual jboolean isRenewable();
-  virtual jboolean isInitial();
-  virtual JArray< jboolean > * getFlags();
-  virtual ::java::util::Date * getAuthTime();
-  virtual ::java::util::Date * getStartTime();
-  virtual ::java::util::Date * getEndTime();
-  virtual ::java::util::Date * getRenewTill();
-  virtual JArray< ::java::net::InetAddress * > * getClientAddresses();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::javax::crypto::SecretKey * getSessionKey();
-private:
-  void checkDestroyed();
-public:
-  virtual ::java::lang::String * toString();
-  virtual jint getSessionKeyType();
-private:
-  static const jlong serialVersionUID = 7395334370157380539LL;
-  static const jint FORWARDABLE = 1;
-  static const jint FORWARDED = 2;
-  static const jint PROXIABLE = 3;
-  static const jint PROXY = 4;
-  static const jint POSTDATED = 6;
-  static const jint RENEWABLE = 8;
-  static const jint INITIAL = 9;
-  static const jint NUM_FLAGS = 12;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) asn1Encoding;
-  ::javax::security::auth::kerberos::KeyImpl * sessionKey;
-  JArray< jboolean > * flags;
-  ::java::util::Date * authTime;
-  ::java::util::Date * startTime;
-  ::java::util::Date * endTime;
-  ::java::util::Date * renewTill;
-  ::javax::security::auth::kerberos::KerberosPrincipal * client;
-  ::javax::security::auth::kerberos::KerberosPrincipal * server;
-  JArray< ::java::net::InetAddress * > * clientAddresses;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_KerberosTicket__
diff --git a/libjava/javax/security/auth/kerberos/KeyImpl.h b/libjava/javax/security/auth/kerberos/KeyImpl.h
deleted file mode 100644
index 4aa9563135b..00000000000
--- a/libjava/javax/security/auth/kerberos/KeyImpl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_KeyImpl__
-#define __javax_security_auth_kerberos_KeyImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class KeyImpl;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::KeyImpl : public ::java::lang::Object
-{
-
-public:
-  KeyImpl(JArray< jbyte > *, jint);
-  KeyImpl(JArray< jchar > *, ::java::lang::String *);
-  ::java::lang::String * getAlgorithm();
-  JArray< jbyte > * getEncoded();
-  ::java::lang::String * getFormat();
-  ::java::lang::String * toString();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) algorithm;
-  jint type;
-  JArray< jbyte > * key;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_KeyImpl__
diff --git a/libjava/javax/security/auth/kerberos/ServicePermission$1.h b/libjava/javax/security/auth/kerberos/ServicePermission$1.h
deleted file mode 100644
index 2d420d56216..00000000000
--- a/libjava/javax/security/auth/kerberos/ServicePermission$1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_ServicePermission$1__
-#define __javax_security_auth_kerberos_ServicePermission$1__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class ServicePermission;
-            class ServicePermission$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::ServicePermission$1 : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  ServicePermission$1(::javax::security::auth::kerberos::ServicePermission *);
-public:
-  virtual void add(::java::security::Permission *);
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::util::Enumeration * elements();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-public: // actually package-private
-  ::javax::security::auth::kerberos::ServicePermission * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_ServicePermission$1__
diff --git a/libjava/javax/security/auth/kerberos/ServicePermission.h b/libjava/javax/security/auth/kerberos/ServicePermission.h
deleted file mode 100644
index 0abca5189dd..00000000000
--- a/libjava/javax/security/auth/kerberos/ServicePermission.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_ServicePermission__
-#define __javax_security_auth_kerberos_ServicePermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class ServicePermission;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::ServicePermission : public ::java::security::Permission
-{
-
-public:
-  ServicePermission(::java::lang::String *, ::java::lang::String *);
-  jboolean implies(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * getActions();
-  ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  void parseActions(::java::lang::String *);
-  static const jint INITIATE = 1;
-  static const jint ACCEPT = 2;
-  jint __attribute__((aligned(__alignof__( ::java::security::Permission)))) flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_ServicePermission__
diff --git a/libjava/javax/security/auth/login/AccountException.h b/libjava/javax/security/auth/login/AccountException.h
deleted file mode 100644
index 1ee7718694f..00000000000
--- a/libjava/javax/security/auth/login/AccountException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AccountException__
-#define __javax_security_auth_login_AccountException__
-
-#pragma interface
-
-#include <javax/security/auth/login/LoginException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AccountException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AccountException : public ::javax::security::auth::login::LoginException
-{
-
-public:
-  AccountException();
-  AccountException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2112878680072211787LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AccountException__
diff --git a/libjava/javax/security/auth/login/AccountExpiredException.h b/libjava/javax/security/auth/login/AccountExpiredException.h
deleted file mode 100644
index 76c92144244..00000000000
--- a/libjava/javax/security/auth/login/AccountExpiredException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AccountExpiredException__
-#define __javax_security_auth_login_AccountExpiredException__
-
-#pragma interface
-
-#include <javax/security/auth/login/AccountException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AccountExpiredException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AccountExpiredException : public ::javax::security::auth::login::AccountException
-{
-
-public:
-  AccountExpiredException();
-  AccountExpiredException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -6064064890162661560LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AccountExpiredException__
diff --git a/libjava/javax/security/auth/login/AccountLockedException.h b/libjava/javax/security/auth/login/AccountLockedException.h
deleted file mode 100644
index e2d8a53df85..00000000000
--- a/libjava/javax/security/auth/login/AccountLockedException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AccountLockedException__
-#define __javax_security_auth_login_AccountLockedException__
-
-#pragma interface
-
-#include <javax/security/auth/login/AccountException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AccountLockedException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AccountLockedException : public ::javax::security::auth::login::AccountException
-{
-
-public:
-  AccountLockedException();
-  AccountLockedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8280345554014066334LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AccountLockedException__
diff --git a/libjava/javax/security/auth/login/AccountNotFoundException.h b/libjava/javax/security/auth/login/AccountNotFoundException.h
deleted file mode 100644
index e258fa0ea9a..00000000000
--- a/libjava/javax/security/auth/login/AccountNotFoundException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AccountNotFoundException__
-#define __javax_security_auth_login_AccountNotFoundException__
-
-#pragma interface
-
-#include <javax/security/auth/login/AccountException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AccountNotFoundException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AccountNotFoundException : public ::javax::security::auth::login::AccountException
-{
-
-public:
-  AccountNotFoundException();
-  AccountNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1498349563916294614LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AccountNotFoundException__
diff --git a/libjava/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.h b/libjava/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.h
deleted file mode 100644
index b5ddbece94b..00000000000
--- a/libjava/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AppConfigurationEntry$LoginModuleControlFlag__
-#define __javax_security_auth_login_AppConfigurationEntry$LoginModuleControlFlag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry$LoginModuleControlFlag;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag : public ::java::lang::Object
-{
-
-  AppConfigurationEntry$LoginModuleControlFlag();
-public:
-  virtual ::java::lang::String * toString();
-  static ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * OPTIONAL;
-  static ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * REQUIRED;
-  static ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * REQUISITE;
-  static ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * SUFFICIENT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AppConfigurationEntry$LoginModuleControlFlag__
diff --git a/libjava/javax/security/auth/login/AppConfigurationEntry.h b/libjava/javax/security/auth/login/AppConfigurationEntry.h
deleted file mode 100644
index 8ca23b3e301..00000000000
--- a/libjava/javax/security/auth/login/AppConfigurationEntry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AppConfigurationEntry__
-#define __javax_security_auth_login_AppConfigurationEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry;
-            class AppConfigurationEntry$LoginModuleControlFlag;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AppConfigurationEntry : public ::java::lang::Object
-{
-
-public:
-  AppConfigurationEntry(::java::lang::String *, ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag *, ::java::util::Map *);
-  virtual ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * getControlFlag();
-  virtual ::java::lang::String * getLoginModuleName();
-  virtual ::java::util::Map * getOptions();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loginModuleName;
-  ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * controlFlag;
-  ::java::util::Map * options;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AppConfigurationEntry__
diff --git a/libjava/javax/security/auth/login/Configuration$1.h b/libjava/javax/security/auth/login/Configuration$1.h
deleted file mode 100644
index e1ace01d4d4..00000000000
--- a/libjava/javax/security/auth/login/Configuration$1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_Configuration$1__
-#define __javax_security_auth_login_Configuration$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class Configuration$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::Configuration$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Configuration$1();
-public:
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_Configuration$1__
diff --git a/libjava/javax/security/auth/login/Configuration.h b/libjava/javax/security/auth/login/Configuration.h
deleted file mode 100644
index 1da5bf7130c..00000000000
--- a/libjava/javax/security/auth/login/Configuration.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_Configuration__
-#define __javax_security_auth_login_Configuration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry;
-            class Configuration;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::Configuration : public ::java::lang::Object
-{
-
-public: // actually protected
-  Configuration();
-public:
-  static ::javax::security::auth::login::Configuration * getConfiguration();
-  static void setConfiguration(::javax::security::auth::login::Configuration *);
-  virtual JArray< ::javax::security::auth::login::AppConfigurationEntry * > * getAppConfigurationEntry(::java::lang::String *) = 0;
-  virtual void refresh() = 0;
-public: // actually package-private
-  static ::javax::security::auth::login::Configuration * getConfig();
-private:
-  static ::javax::security::auth::login::Configuration * config;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_Configuration__
diff --git a/libjava/javax/security/auth/login/CredentialException.h b/libjava/javax/security/auth/login/CredentialException.h
deleted file mode 100644
index 87b0c068397..00000000000
--- a/libjava/javax/security/auth/login/CredentialException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_CredentialException__
-#define __javax_security_auth_login_CredentialException__
-
-#pragma interface
-
-#include <javax/security/auth/login/LoginException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class CredentialException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::CredentialException : public ::javax::security::auth::login::LoginException
-{
-
-public:
-  CredentialException();
-  CredentialException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4772893876810601859LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_CredentialException__
diff --git a/libjava/javax/security/auth/login/CredentialExpiredException.h b/libjava/javax/security/auth/login/CredentialExpiredException.h
deleted file mode 100644
index a10aefa13bd..00000000000
--- a/libjava/javax/security/auth/login/CredentialExpiredException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_CredentialExpiredException__
-#define __javax_security_auth_login_CredentialExpiredException__
-
-#pragma interface
-
-#include <javax/security/auth/login/CredentialException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class CredentialExpiredException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::CredentialExpiredException : public ::javax::security::auth::login::CredentialException
-{
-
-public:
-  CredentialExpiredException();
-  CredentialExpiredException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5344739593859737937LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_CredentialExpiredException__
diff --git a/libjava/javax/security/auth/login/CredentialNotFoundException.h b/libjava/javax/security/auth/login/CredentialNotFoundException.h
deleted file mode 100644
index c60f3db8de4..00000000000
--- a/libjava/javax/security/auth/login/CredentialNotFoundException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_CredentialNotFoundException__
-#define __javax_security_auth_login_CredentialNotFoundException__
-
-#pragma interface
-
-#include <javax/security/auth/login/CredentialException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class CredentialNotFoundException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::CredentialNotFoundException : public ::javax::security::auth::login::CredentialException
-{
-
-public:
-  CredentialNotFoundException();
-  CredentialNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7779934467214319475LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_CredentialNotFoundException__
diff --git a/libjava/javax/security/auth/login/FailedLoginException.h b/libjava/javax/security/auth/login/FailedLoginException.h
deleted file mode 100644
index 014a472c6d9..00000000000
--- a/libjava/javax/security/auth/login/FailedLoginException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_FailedLoginException__
-#define __javax_security_auth_login_FailedLoginException__
-
-#pragma interface
-
-#include <javax/security/auth/login/LoginException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class FailedLoginException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::FailedLoginException : public ::javax::security::auth::login::LoginException
-{
-
-public:
-  FailedLoginException();
-  FailedLoginException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 802556922354616286LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_FailedLoginException__
diff --git a/libjava/javax/security/auth/login/LoginContext.h b/libjava/javax/security/auth/login/LoginContext.h
deleted file mode 100644
index b6d39cd5038..00000000000
--- a/libjava/javax/security/auth/login/LoginContext.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_LoginContext__
-#define __javax_security_auth_login_LoginContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-        namespace login
-        {
-            class AppConfigurationEntry;
-            class Configuration;
-            class LoginContext;
-        }
-        namespace spi
-        {
-            class LoginModule;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::LoginContext : public ::java::lang::Object
-{
-
-public:
-  LoginContext(::java::lang::String *);
-  LoginContext(::java::lang::String *, ::javax::security::auth::callback::CallbackHandler *);
-  LoginContext(::java::lang::String *, ::javax::security::auth::Subject *);
-  LoginContext(::java::lang::String *, ::javax::security::auth::Subject *, ::javax::security::auth::callback::CallbackHandler *);
-  LoginContext(::java::lang::String *, ::javax::security::auth::Subject *, ::javax::security::auth::callback::CallbackHandler *, ::javax::security::auth::login::Configuration *);
-  virtual ::javax::security::auth::Subject * getSubject();
-  virtual void login();
-  virtual void logout();
-private:
-  static ::javax::security::auth::callback::CallbackHandler * defaultHandler();
-  ::javax::security::auth::spi::LoginModule * lookupModule(::javax::security::auth::login::AppConfigurationEntry *, ::javax::security::auth::Subject *, ::java::util::Map *);
-  static ::java::lang::String * OTHER;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::javax::security::auth::callback::CallbackHandler * cbHandler;
-  ::javax::security::auth::Subject * subject;
-  JArray< ::javax::security::auth::login::AppConfigurationEntry * > * entries;
-  JArray< ::javax::security::auth::spi::LoginModule * > * modules;
-  ::java::util::Map * sharedState;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_LoginContext__
diff --git a/libjava/javax/security/auth/login/LoginException.h b/libjava/javax/security/auth/login/LoginException.h
deleted file mode 100644
index e68060db78c..00000000000
--- a/libjava/javax/security/auth/login/LoginException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_LoginException__
-#define __javax_security_auth_login_LoginException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class LoginException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::LoginException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  LoginException();
-  LoginException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4679091624035232488LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_LoginException__
diff --git a/libjava/javax/security/auth/login/NullConfiguration.h b/libjava/javax/security/auth/login/NullConfiguration.h
deleted file mode 100644
index 5d73d7ff33f..00000000000
--- a/libjava/javax/security/auth/login/NullConfiguration.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_NullConfiguration__
-#define __javax_security_auth_login_NullConfiguration__
-
-#pragma interface
-
-#include <javax/security/auth/login/Configuration.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry;
-            class NullConfiguration;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::NullConfiguration : public ::javax::security::auth::login::Configuration
-{
-
-public: // actually package-private
-  NullConfiguration();
-public:
-  JArray< ::javax::security::auth::login::AppConfigurationEntry * > * getAppConfigurationEntry(::java::lang::String *);
-  void refresh();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_NullConfiguration__
diff --git a/libjava/javax/security/auth/spi/LoginModule.h b/libjava/javax/security/auth/spi/LoginModule.h
deleted file mode 100644
index 413c684f0e7..00000000000
--- a/libjava/javax/security/auth/spi/LoginModule.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_spi_LoginModule__
-#define __javax_security_auth_spi_LoginModule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-        namespace spi
-        {
-            class LoginModule;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::spi::LoginModule : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean abort() = 0;
-  virtual jboolean commit() = 0;
-  virtual void initialize(::javax::security::auth::Subject *, ::javax::security::auth::callback::CallbackHandler *, ::java::util::Map *, ::java::util::Map *) = 0;
-  virtual jboolean login() = 0;
-  virtual jboolean logout() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_spi_LoginModule__
diff --git a/libjava/javax/security/auth/x500/X500Principal.h b/libjava/javax/security/auth/x500/X500Principal.h
deleted file mode 100644
index 75cdb05e7ef..00000000000
--- a/libjava/javax/security/auth/x500/X500Principal.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_x500_X500Principal__
-#define __javax_security_auth_x500_X500Principal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::x500::X500Principal : public ::java::lang::Object
-{
-
-  X500Principal();
-public:
-  X500Principal(::java::lang::String *);
-  X500Principal(JArray< jbyte > *);
-  X500Principal(::java::io::InputStream *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  JArray< jbyte > * getEncoded();
-  ::java::lang::String * getName();
-  ::java::lang::String * getName(::java::lang::String *);
-  ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  jint size();
-  ::java::lang::String * getComponent(::gnu::java::security::OID *, jint);
-  void encodeDer();
-  void parseString(::java::lang::String *);
-  ::java::lang::String * readAttributeType(::java::io::Reader *);
-  ::java::lang::String * readAttributeValue(::java::io::Reader *);
-  void parseDer(::java::io::InputStream *);
-  void newRelativeDistinguishedName();
-  void putComponent(::gnu::java::security::OID *, ::java::lang::String *);
-  void putComponent(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * compressWS(::java::lang::String *);
-  static JArray< jbyte > * toByteArray(::java::lang::String *);
-  static const jlong serialVersionUID = -500463348111345721LL;
-public:
-  static ::java::lang::String * CANONICAL;
-  static ::java::lang::String * RFC1779;
-  static ::java::lang::String * RFC2253;
-private:
-  static ::gnu::java::security::OID * CN;
-  static ::gnu::java::security::OID * C;
-  static ::gnu::java::security::OID * L;
-  static ::gnu::java::security::OID * ST;
-  static ::gnu::java::security::OID * STREET;
-  static ::gnu::java::security::OID * O;
-  static ::gnu::java::security::OID * OU;
-  static ::gnu::java::security::OID * DC;
-  static ::gnu::java::security::OID * UID;
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
-  ::java::util::Map * currentRdn;
-  jboolean fixed;
-  JArray< jbyte > * encoded;
-  jint sep;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_x500_X500Principal__
diff --git a/libjava/javax/security/auth/x500/X500PrivateCredential.h b/libjava/javax/security/auth/x500/X500PrivateCredential.h
deleted file mode 100644
index 27ee30e4a0f..00000000000
--- a/libjava/javax/security/auth/x500/X500PrivateCredential.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_x500_X500PrivateCredential__
-#define __javax_security_auth_x500_X500PrivateCredential__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500PrivateCredential;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::x500::X500PrivateCredential : public ::java::lang::Object
-{
-
-public:
-  X500PrivateCredential(::java::security::cert::X509Certificate *, ::java::security::PrivateKey *);
-  X500PrivateCredential(::java::security::cert::X509Certificate *, ::java::security::PrivateKey *, ::java::lang::String *);
-  ::java::security::cert::X509Certificate * getCertificate();
-  ::java::security::PrivateKey * getPrivateKey();
-  ::java::lang::String * getAlias();
-  void destroy();
-  jboolean isDestroyed();
-private:
-  ::java::security::PrivateKey * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::security::cert::X509Certificate * certificate;
-  ::java::lang::String * alias;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_x500_X500PrivateCredential__
diff --git a/libjava/javax/security/cert/Certificate.h b/libjava/javax/security/cert/Certificate.h
deleted file mode 100644
index 1417a9ae2c6..00000000000
--- a/libjava/javax/security/cert/Certificate.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_Certificate__
-#define __javax_security_cert_Certificate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class javax::security::cert::Certificate : public ::java::lang::Object
-{
-
-public:
-  Certificate();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual void verify(::java::security::PublicKey *) = 0;
-  virtual void verify(::java::security::PublicKey *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::security::PublicKey * getPublicKey() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_Certificate__
diff --git a/libjava/javax/security/cert/CertificateEncodingException.h b/libjava/javax/security/cert/CertificateEncodingException.h
deleted file mode 100644
index d9f102e63cc..00000000000
--- a/libjava/javax/security/cert/CertificateEncodingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateEncodingException__
-#define __javax_security_cert_CertificateEncodingException__
-
-#pragma interface
-
-#include <javax/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateEncodingException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateEncodingException : public ::javax::security::cert::CertificateException
-{
-
-public:
-  CertificateEncodingException();
-  CertificateEncodingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateEncodingException__
diff --git a/libjava/javax/security/cert/CertificateException.h b/libjava/javax/security/cert/CertificateException.h
deleted file mode 100644
index 259c5fb0f97..00000000000
--- a/libjava/javax/security/cert/CertificateException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateException__
-#define __javax_security_cert_CertificateException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateException : public ::java::lang::Exception
-{
-
-public:
-  CertificateException();
-  CertificateException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateException__
diff --git a/libjava/javax/security/cert/CertificateExpiredException.h b/libjava/javax/security/cert/CertificateExpiredException.h
deleted file mode 100644
index c8260988d4e..00000000000
--- a/libjava/javax/security/cert/CertificateExpiredException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateExpiredException__
-#define __javax_security_cert_CertificateExpiredException__
-
-#pragma interface
-
-#include <javax/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateExpiredException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateExpiredException : public ::javax::security::cert::CertificateException
-{
-
-public:
-  CertificateExpiredException();
-  CertificateExpiredException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateExpiredException__
diff --git a/libjava/javax/security/cert/CertificateNotYetValidException.h b/libjava/javax/security/cert/CertificateNotYetValidException.h
deleted file mode 100644
index 6b840c51e3b..00000000000
--- a/libjava/javax/security/cert/CertificateNotYetValidException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateNotYetValidException__
-#define __javax_security_cert_CertificateNotYetValidException__
-
-#pragma interface
-
-#include <javax/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateNotYetValidException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateNotYetValidException : public ::javax::security::cert::CertificateException
-{
-
-public:
-  CertificateNotYetValidException();
-  CertificateNotYetValidException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateNotYetValidException__
diff --git a/libjava/javax/security/cert/CertificateParsingException.h b/libjava/javax/security/cert/CertificateParsingException.h
deleted file mode 100644
index e55a28405c1..00000000000
--- a/libjava/javax/security/cert/CertificateParsingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateParsingException__
-#define __javax_security_cert_CertificateParsingException__
-
-#pragma interface
-
-#include <javax/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateParsingException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateParsingException : public ::javax::security::cert::CertificateException
-{
-
-public:
-  CertificateParsingException();
-  CertificateParsingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateParsingException__
diff --git a/libjava/javax/security/cert/X509CertBridge.h b/libjava/javax/security/cert/X509CertBridge.h
deleted file mode 100644
index be6a18f15df..00000000000
--- a/libjava/javax/security/cert/X509CertBridge.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_X509CertBridge__
-#define __javax_security_cert_X509CertBridge__
-
-#pragma interface
-
-#include <javax/security/cert/X509Certificate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-        class PublicKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509CertBridge;
-      }
-    }
-  }
-}
-
-class javax::security::cert::X509CertBridge : public ::javax::security::cert::X509Certificate
-{
-
-public: // actually package-private
-  X509CertBridge(::java::security::cert::X509Certificate *);
-public:
-  JArray< jbyte > * getEncoded();
-  void verify(::java::security::PublicKey *);
-  void verify(::java::security::PublicKey *, ::java::lang::String *);
-  ::java::lang::String * toString();
-  ::java::security::PublicKey * getPublicKey();
-  void checkValidity();
-  void checkValidity(::java::util::Date *);
-  jint getVersion();
-  ::java::math::BigInteger * getSerialNumber();
-  ::java::security::Principal * getIssuerDN();
-  ::java::security::Principal * getSubjectDN();
-  ::java::util::Date * getNotBefore();
-  ::java::util::Date * getNotAfter();
-  ::java::lang::String * getSigAlgName();
-  ::java::lang::String * getSigAlgOID();
-  JArray< jbyte > * getSigAlgParams();
-private:
-  ::java::security::cert::X509Certificate * __attribute__((aligned(__alignof__( ::javax::security::cert::X509Certificate)))) cert;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_X509CertBridge__
diff --git a/libjava/javax/security/cert/X509Certificate.h b/libjava/javax/security/cert/X509Certificate.h
deleted file mode 100644
index 8d1cda6c6b9..00000000000
--- a/libjava/javax/security/cert/X509Certificate.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_X509Certificate__
-#define __javax_security_cert_X509Certificate__
-
-#pragma interface
-
-#include <javax/security/cert/Certificate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class javax::security::cert::X509Certificate : public ::javax::security::cert::Certificate
-{
-
-public:
-  X509Certificate();
-  static ::javax::security::cert::X509Certificate * getInstance(JArray< jbyte > *);
-  static ::javax::security::cert::X509Certificate * getInstance(::java::io::InputStream *);
-  virtual void checkValidity() = 0;
-  virtual void checkValidity(::java::util::Date *) = 0;
-  virtual jint getVersion() = 0;
-  virtual ::java::math::BigInteger * getSerialNumber() = 0;
-  virtual ::java::security::Principal * getIssuerDN() = 0;
-  virtual ::java::security::Principal * getSubjectDN() = 0;
-  virtual ::java::util::Date * getNotBefore() = 0;
-  virtual ::java::util::Date * getNotAfter() = 0;
-  virtual ::java::lang::String * getSigAlgName() = 0;
-  virtual ::java::lang::String * getSigAlgOID() = 0;
-  virtual JArray< jbyte > * getSigAlgParams() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_X509Certificate__
diff --git a/libjava/javax/security/sasl/AuthenticationException.h b/libjava/javax/security/sasl/AuthenticationException.h
deleted file mode 100644
index 1ab4491acae..00000000000
--- a/libjava/javax/security/sasl/AuthenticationException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_AuthenticationException__
-#define __javax_security_sasl_AuthenticationException__
-
-#pragma interface
-
-#include <javax/security/sasl/SaslException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class AuthenticationException;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::AuthenticationException : public ::javax::security::sasl::SaslException
-{
-
-public:
-  AuthenticationException();
-  AuthenticationException(::java::lang::String *);
-  AuthenticationException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_AuthenticationException__
diff --git a/libjava/javax/security/sasl/AuthorizeCallback.h b/libjava/javax/security/sasl/AuthorizeCallback.h
deleted file mode 100644
index 3ae14bdb4ef..00000000000
--- a/libjava/javax/security/sasl/AuthorizeCallback.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_AuthorizeCallback__
-#define __javax_security_sasl_AuthorizeCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class AuthorizeCallback;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::AuthorizeCallback : public ::java::lang::Object
-{
-
-public:
-  AuthorizeCallback(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAuthenticationID();
-  virtual ::java::lang::String * getAuthorizationID();
-  virtual jboolean isAuthorized();
-  virtual void setAuthorized(jboolean);
-  virtual ::java::lang::String * getAuthorizedID();
-  virtual void setAuthorizedID(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2353344186490470805LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) authenticationID;
-  ::java::lang::String * authorizationID;
-  ::java::lang::String * authorizedID;
-  jboolean authorized;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_AuthorizeCallback__
diff --git a/libjava/javax/security/sasl/RealmCallback.h b/libjava/javax/security/sasl/RealmCallback.h
deleted file mode 100644
index 17dff32907e..00000000000
--- a/libjava/javax/security/sasl/RealmCallback.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_RealmCallback__
-#define __javax_security_sasl_RealmCallback__
-
-#pragma interface
-
-#include <javax/security/auth/callback/TextInputCallback.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class RealmCallback;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::RealmCallback : public ::javax::security::auth::callback::TextInputCallback
-{
-
-public:
-  RealmCallback(::java::lang::String *);
-  RealmCallback(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_RealmCallback__
diff --git a/libjava/javax/security/sasl/RealmChoiceCallback.h b/libjava/javax/security/sasl/RealmChoiceCallback.h
deleted file mode 100644
index c1ec2a20e39..00000000000
--- a/libjava/javax/security/sasl/RealmChoiceCallback.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_RealmChoiceCallback__
-#define __javax_security_sasl_RealmChoiceCallback__
-
-#pragma interface
-
-#include <javax/security/auth/callback/ChoiceCallback.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class RealmChoiceCallback;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::RealmChoiceCallback : public ::javax::security::auth::callback::ChoiceCallback
-{
-
-public:
-  RealmChoiceCallback(::java::lang::String *, JArray< ::java::lang::String * > *, jint, jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_RealmChoiceCallback__
diff --git a/libjava/javax/security/sasl/Sasl.h b/libjava/javax/security/sasl/Sasl.h
deleted file mode 100644
index a34b499922a..00000000000
--- a/libjava/javax/security/sasl/Sasl.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_Sasl__
-#define __javax_security_sasl_Sasl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-      namespace sasl
-      {
-          class Sasl;
-          class SaslClient;
-          class SaslServer;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::Sasl : public ::java::lang::Object
-{
-
-  Sasl();
-public:
-  static ::javax::security::sasl::SaslClient * createSaslClient(JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *);
-  static ::java::util::Enumeration * getSaslClientFactories();
-  static ::javax::security::sasl::SaslServer * createSaslServer(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *);
-  static ::java::util::Enumeration * getSaslServerFactories();
-  static ::java::lang::String * QOP;
-  static ::java::lang::String * STRENGTH;
-  static ::java::lang::String * SERVER_AUTH;
-  static ::java::lang::String * MAX_BUFFER;
-  static ::java::lang::String * RAW_SEND_SIZE;
-  static ::java::lang::String * POLICY_NOPLAINTEXT;
-  static ::java::lang::String * POLICY_NOACTIVE;
-  static ::java::lang::String * POLICY_NODICTIONARY;
-  static ::java::lang::String * POLICY_NOANONYMOUS;
-  static ::java::lang::String * POLICY_FORWARD_SECRECY;
-  static ::java::lang::String * POLICY_PASS_CREDENTIALS;
-  static ::java::lang::String * REUSE;
-  static ::java::lang::String * CREDENTIALS;
-private:
-  static ::java::lang::String * CLIENT_FACTORY_SVC;
-  static ::java::lang::String * SERVER_FACTORY_SVC;
-  static ::java::lang::String * ALIAS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_Sasl__
diff --git a/libjava/javax/security/sasl/SaslClient.h b/libjava/javax/security/sasl/SaslClient.h
deleted file mode 100644
index cad1cdaa8f6..00000000000
--- a/libjava/javax/security/sasl/SaslClient.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslClient__
-#define __javax_security_sasl_SaslClient__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class SaslClient;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslClient : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getMechanismName() = 0;
-  virtual jboolean hasInitialResponse() = 0;
-  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *) = 0;
-  virtual jboolean isComplete() = 0;
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::lang::Object * getNegotiatedProperty(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_sasl_SaslClient__
diff --git a/libjava/javax/security/sasl/SaslClientFactory.h b/libjava/javax/security/sasl/SaslClientFactory.h
deleted file mode 100644
index ab603a104af..00000000000
--- a/libjava/javax/security/sasl/SaslClientFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslClientFactory__
-#define __javax_security_sasl_SaslClientFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-      namespace sasl
-      {
-          class SaslClient;
-          class SaslClientFactory;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslClientFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::security::sasl::SaslClient * createSaslClient(JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *) = 0;
-  virtual JArray< ::java::lang::String * > * getMechanismNames(::java::util::Map *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_sasl_SaslClientFactory__
diff --git a/libjava/javax/security/sasl/SaslException.h b/libjava/javax/security/sasl/SaslException.h
deleted file mode 100644
index 9cfd9fce38b..00000000000
--- a/libjava/javax/security/sasl/SaslException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslException__
-#define __javax_security_sasl_SaslException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class SaslException;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslException : public ::java::io::IOException
-{
-
-public:
-  SaslException();
-  SaslException(::java::lang::String *);
-  SaslException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4579784287983423626LL;
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::io::IOException)))) _exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_SaslException__
diff --git a/libjava/javax/security/sasl/SaslServer.h b/libjava/javax/security/sasl/SaslServer.h
deleted file mode 100644
index d1f6a89c6ce..00000000000
--- a/libjava/javax/security/sasl/SaslServer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslServer__
-#define __javax_security_sasl_SaslServer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class SaslServer;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslServer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getMechanismName() = 0;
-  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *) = 0;
-  virtual jboolean isComplete() = 0;
-  virtual ::java::lang::String * getAuthorizationID() = 0;
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::lang::Object * getNegotiatedProperty(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_sasl_SaslServer__
diff --git a/libjava/javax/security/sasl/SaslServerFactory.h b/libjava/javax/security/sasl/SaslServerFactory.h
deleted file mode 100644
index ceaf0016ed9..00000000000
--- a/libjava/javax/security/sasl/SaslServerFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslServerFactory__
-#define __javax_security_sasl_SaslServerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-      namespace sasl
-      {
-          class SaslServer;
-          class SaslServerFactory;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslServerFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::security::sasl::SaslServer * createSaslServer(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *) = 0;
-  virtual JArray< ::java::lang::String * > * getMechanismNames(::java::util::Map *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_sasl_SaslServerFactory__
diff --git a/libjava/javax/sound/midi/ControllerEventListener.h b/libjava/javax/sound/midi/ControllerEventListener.h
deleted file mode 100644
index f3352319082..00000000000
--- a/libjava/javax/sound/midi/ControllerEventListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_ControllerEventListener__
-#define __javax_sound_midi_ControllerEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class ControllerEventListener;
-          class ShortMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::ControllerEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void controlChange(::javax::sound::midi::ShortMessage *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_ControllerEventListener__
diff --git a/libjava/javax/sound/midi/Instrument.h b/libjava/javax/sound/midi/Instrument.h
deleted file mode 100644
index 9f895a57f46..00000000000
--- a/libjava/javax/sound/midi/Instrument.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Instrument__
-#define __javax_sound_midi_Instrument__
-
-#pragma interface
-
-#include <javax/sound/midi/SoundbankResource.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Instrument;
-          class Patch;
-          class Soundbank;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Instrument : public ::javax::sound::midi::SoundbankResource
-{
-
-public: // actually protected
-  Instrument(::javax::sound::midi::Soundbank *, ::javax::sound::midi::Patch *, ::java::lang::String *, ::java::lang::Class *);
-public:
-  virtual ::javax::sound::midi::Patch * getPatch();
-private:
-  ::javax::sound::midi::Patch * __attribute__((aligned(__alignof__( ::javax::sound::midi::SoundbankResource)))) patch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Instrument__
diff --git a/libjava/javax/sound/midi/InvalidMidiDataException.h b/libjava/javax/sound/midi/InvalidMidiDataException.h
deleted file mode 100644
index c66b0816f99..00000000000
--- a/libjava/javax/sound/midi/InvalidMidiDataException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_InvalidMidiDataException__
-#define __javax_sound_midi_InvalidMidiDataException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class InvalidMidiDataException;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::InvalidMidiDataException : public ::java::lang::Exception
-{
-
-public:
-  InvalidMidiDataException();
-  InvalidMidiDataException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2780771756789932067LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_InvalidMidiDataException__
diff --git a/libjava/javax/sound/midi/MetaEventListener.h b/libjava/javax/sound/midi/MetaEventListener.h
deleted file mode 100644
index ccbed891bea..00000000000
--- a/libjava/javax/sound/midi/MetaEventListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MetaEventListener__
-#define __javax_sound_midi_MetaEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MetaEventListener;
-          class MetaMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MetaEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void meta(::javax::sound::midi::MetaMessage *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_MetaEventListener__
diff --git a/libjava/javax/sound/midi/MetaMessage.h b/libjava/javax/sound/midi/MetaMessage.h
deleted file mode 100644
index a50e3b22883..00000000000
--- a/libjava/javax/sound/midi/MetaMessage.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MetaMessage__
-#define __javax_sound_midi_MetaMessage__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiMessage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MetaMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MetaMessage : public ::javax::sound::midi::MidiMessage
-{
-
-public:
-  MetaMessage();
-public: // actually protected
-  MetaMessage(JArray< jbyte > *);
-public:
-  virtual void setMessage(jint, JArray< jbyte > *, jint);
-  virtual jint getType();
-  virtual JArray< jbyte > * getData();
-  virtual ::java::lang::Object * clone();
-  static const jint META = 255;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::sound::midi::MidiMessage)))) lengthLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MetaMessage__
diff --git a/libjava/javax/sound/midi/MidiChannel.h b/libjava/javax/sound/midi/MidiChannel.h
deleted file mode 100644
index 4d348d2f783..00000000000
--- a/libjava/javax/sound/midi/MidiChannel.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiChannel__
-#define __javax_sound_midi_MidiChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiChannel;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiChannel : public ::java::lang::Object
-{
-
-public:
-  virtual void noteOn(jint, jint) = 0;
-  virtual void noteOff(jint, jint) = 0;
-  virtual void noteOff(jint) = 0;
-  virtual void setPolyPressure(jint, jint) = 0;
-  virtual jint getPolyPressure(jint) = 0;
-  virtual void setChannelPressure(jint) = 0;
-  virtual jint getChannelPressure() = 0;
-  virtual void controlChange(jint, jint) = 0;
-  virtual jint getController(jint) = 0;
-  virtual void programChange(jint) = 0;
-  virtual void programChange(jint, jint) = 0;
-  virtual jint getProgram() = 0;
-  virtual void setPitchBend(jint) = 0;
-  virtual jint getPitchBend() = 0;
-  virtual void resetAllControllers() = 0;
-  virtual void allNotesOff() = 0;
-  virtual void allSoundOff() = 0;
-  virtual jboolean localControl(jboolean) = 0;
-  virtual void setMono(jboolean) = 0;
-  virtual jboolean getMono() = 0;
-  virtual void setOmni(jboolean) = 0;
-  virtual jboolean getOmni() = 0;
-  virtual void setMute(jboolean) = 0;
-  virtual jboolean getMute() = 0;
-  virtual void setSolo(jboolean) = 0;
-  virtual jboolean getSolo() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_MidiChannel__
diff --git a/libjava/javax/sound/midi/MidiDevice$Info.h b/libjava/javax/sound/midi/MidiDevice$Info.h
deleted file mode 100644
index 02b9c42f667..00000000000
--- a/libjava/javax/sound/midi/MidiDevice$Info.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiDevice$Info__
-#define __javax_sound_midi_MidiDevice$Info__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiDevice$Info : public ::java::lang::Object
-{
-
-public: // actually protected
-  MidiDevice$Info(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getVendor();
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getVersion();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * vendor;
-  ::java::lang::String * description;
-  ::java::lang::String * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiDevice$Info__
diff --git a/libjava/javax/sound/midi/MidiDevice.h b/libjava/javax/sound/midi/MidiDevice.h
deleted file mode 100644
index bc952ab1076..00000000000
--- a/libjava/javax/sound/midi/MidiDevice.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiDevice__
-#define __javax_sound_midi_MidiDevice__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-          class MidiDevice$Info;
-          class Receiver;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiDevice : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo() = 0;
-  virtual void open() = 0;
-  virtual void close() = 0;
-  virtual jboolean isOpen() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual jint getMaxReceivers() = 0;
-  virtual jint getMaxTransmitters() = 0;
-  virtual ::javax::sound::midi::Receiver * getReceiver() = 0;
-  virtual ::javax::sound::midi::Transmitter * getTransmitter() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_MidiDevice__
diff --git a/libjava/javax/sound/midi/MidiEvent.h b/libjava/javax/sound/midi/MidiEvent.h
deleted file mode 100644
index ef6dbd0f267..00000000000
--- a/libjava/javax/sound/midi/MidiEvent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiEvent__
-#define __javax_sound_midi_MidiEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiEvent;
-          class MidiMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiEvent : public ::java::lang::Object
-{
-
-public:
-  MidiEvent(::javax::sound::midi::MidiMessage *, jlong);
-  virtual ::javax::sound::midi::MidiMessage * getMessage();
-  virtual void setTick(jlong);
-  virtual jlong getTick();
-private:
-  ::javax::sound::midi::MidiMessage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) message;
-  jlong tick;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiEvent__
diff --git a/libjava/javax/sound/midi/MidiFileFormat.h b/libjava/javax/sound/midi/MidiFileFormat.h
deleted file mode 100644
index 57fab827a78..00000000000
--- a/libjava/javax/sound/midi/MidiFileFormat.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiFileFormat__
-#define __javax_sound_midi_MidiFileFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiFileFormat;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiFileFormat : public ::java::lang::Object
-{
-
-public:
-  MidiFileFormat(jint, jfloat, jint, jint, jlong);
-  virtual jint getType();
-  virtual jfloat getDivisionType();
-  virtual jint getResolution();
-  virtual jint getByteLength();
-  virtual jlong getMicrosecondLength();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jfloat divisionType;
-  jint resolution;
-  jint byteLength;
-  jlong microsecondLength;
-public:
-  static const jint UNKNOWN_LENGTH = -1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiFileFormat__
diff --git a/libjava/javax/sound/midi/MidiMessage.h b/libjava/javax/sound/midi/MidiMessage.h
deleted file mode 100644
index bf7e2d21725..00000000000
--- a/libjava/javax/sound/midi/MidiMessage.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiMessage__
-#define __javax_sound_midi_MidiMessage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiMessage : public ::java::lang::Object
-{
-
-public: // actually protected
-  MidiMessage(JArray< jbyte > *);
-  virtual void setMessage(JArray< jbyte > *, jint);
-public:
-  virtual JArray< jbyte > * getMessage();
-  virtual jint getStatus();
-  virtual jint getLength();
-  virtual ::java::lang::Object * clone() = 0;
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiMessage__
diff --git a/libjava/javax/sound/midi/MidiSystem.h b/libjava/javax/sound/midi/MidiSystem.h
deleted file mode 100644
index 487b9d6de8e..00000000000
--- a/libjava/javax/sound/midi/MidiSystem.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiSystem__
-#define __javax_sound_midi_MidiSystem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-          class MidiDevice$Info;
-          class MidiFileFormat;
-          class MidiSystem;
-          class Receiver;
-          class Sequence;
-          class Sequencer;
-          class Soundbank;
-          class Synthesizer;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiSystem : public ::java::lang::Object
-{
-
-  MidiSystem();
-public:
-  static JArray< ::javax::sound::midi::MidiDevice$Info * > * getMidiDeviceInfo();
-  static ::javax::sound::midi::MidiDevice * getMidiDevice(::javax::sound::midi::MidiDevice$Info *);
-  static ::javax::sound::midi::Receiver * getReceiver();
-  static ::javax::sound::midi::Transmitter * getTransmitter();
-  static ::javax::sound::midi::Synthesizer * getSynthesizer();
-  static ::javax::sound::midi::Sequencer * getSequencer();
-  static ::javax::sound::midi::Soundbank * getSoundbank(::java::io::InputStream *);
-  static ::javax::sound::midi::Soundbank * getSoundbank(::java::net::URL *);
-  static ::javax::sound::midi::Soundbank * getSoundbank(::java::io::File *);
-  static ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::InputStream *);
-  static ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::net::URL *);
-  static ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::File *);
-  static ::javax::sound::midi::Sequence * getSequence(::java::io::InputStream *);
-  static ::javax::sound::midi::Sequence * getSequence(::java::net::URL *);
-  static ::javax::sound::midi::Sequence * getSequence(::java::io::File *);
-  static JArray< jint > * getMidiFileTypes();
-  static jboolean isFileTypeSupported(jint);
-  static JArray< jint > * getMidiFileTypes(::javax::sound::midi::Sequence *);
-  static jboolean isFileTypeSupported(jint, ::javax::sound::midi::Sequence *);
-  static jint write(::javax::sound::midi::Sequence *, jint, ::java::io::OutputStream *);
-  static jint write(::javax::sound::midi::Sequence *, jint, ::java::io::File *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiSystem__
diff --git a/libjava/javax/sound/midi/MidiUnavailableException.h b/libjava/javax/sound/midi/MidiUnavailableException.h
deleted file mode 100644
index 740496db2dd..00000000000
--- a/libjava/javax/sound/midi/MidiUnavailableException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiUnavailableException__
-#define __javax_sound_midi_MidiUnavailableException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiUnavailableException;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiUnavailableException : public ::java::lang::Exception
-{
-
-public:
-  MidiUnavailableException();
-  MidiUnavailableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6093809578628944323LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiUnavailableException__
diff --git a/libjava/javax/sound/midi/Patch.h b/libjava/javax/sound/midi/Patch.h
deleted file mode 100644
index fcc9b31867d..00000000000
--- a/libjava/javax/sound/midi/Patch.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Patch__
-#define __javax_sound_midi_Patch__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Patch;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Patch : public ::java::lang::Object
-{
-
-public:
-  Patch(jint, jint);
-  virtual jint getBank();
-  virtual jint getProgram();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) bank;
-  jint program;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Patch__
diff --git a/libjava/javax/sound/midi/Receiver.h b/libjava/javax/sound/midi/Receiver.h
deleted file mode 100644
index b82d06f185f..00000000000
--- a/libjava/javax/sound/midi/Receiver.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Receiver__
-#define __javax_sound_midi_Receiver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiMessage;
-          class Receiver;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Receiver : public ::java::lang::Object
-{
-
-public:
-  virtual void send(::javax::sound::midi::MidiMessage *, jlong) = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Receiver__
diff --git a/libjava/javax/sound/midi/Sequence.h b/libjava/javax/sound/midi/Sequence.h
deleted file mode 100644
index 0ca6ed71148..00000000000
--- a/libjava/javax/sound/midi/Sequence.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Sequence__
-#define __javax_sound_midi_Sequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Patch;
-          class Sequence;
-          class Track;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Sequence : public ::java::lang::Object
-{
-
-  void init(jfloat, jint, jint);
-public:
-  Sequence(jfloat, jint);
-  Sequence(jfloat, jint, jint);
-  virtual jfloat getDivisionType();
-  virtual jint getResolution();
-  virtual ::javax::sound::midi::Track * createTrack();
-  virtual jboolean deleteTrack(::javax::sound::midi::Track *);
-  virtual JArray< ::javax::sound::midi::Track * > * getTracks();
-  virtual jlong getMicrosecondLength();
-  virtual jlong getTickLength();
-  virtual JArray< ::javax::sound::midi::Patch * > * getPatchList();
-public: // actually protected
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) divisionType;
-  jint resolution;
-  ::java::util::Vector * tracks;
-public:
-  static jfloat PPQ;
-  static jfloat SMPTE_24;
-  static jfloat SMPTE_25;
-  static jfloat SMPTE_30;
-  static jfloat SMPTE_30DROP;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Sequence__
diff --git a/libjava/javax/sound/midi/Sequencer$SyncMode.h b/libjava/javax/sound/midi/Sequencer$SyncMode.h
deleted file mode 100644
index 70944db8bd8..00000000000
--- a/libjava/javax/sound/midi/Sequencer$SyncMode.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Sequencer$SyncMode__
-#define __javax_sound_midi_Sequencer$SyncMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Sequencer$SyncMode;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Sequencer$SyncMode : public ::java::lang::Object
-{
-
-public: // actually protected
-  Sequencer$SyncMode(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::midi::Sequencer$SyncMode * INTERNAL_CLOCK;
-  static ::javax::sound::midi::Sequencer$SyncMode * MIDI_SYNC;
-  static ::javax::sound::midi::Sequencer$SyncMode * MIDI_TIME_CODE;
-  static ::javax::sound::midi::Sequencer$SyncMode * NO_SYNC;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Sequencer$SyncMode__
diff --git a/libjava/javax/sound/midi/Sequencer.h b/libjava/javax/sound/midi/Sequencer.h
deleted file mode 100644
index 453634e413a..00000000000
--- a/libjava/javax/sound/midi/Sequencer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Sequencer__
-#define __javax_sound_midi_Sequencer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class ControllerEventListener;
-          class MetaEventListener;
-          class MidiDevice$Info;
-          class Receiver;
-          class Sequence;
-          class Sequencer;
-          class Sequencer$SyncMode;
-          class Track;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Sequencer : public ::java::lang::Object
-{
-
-public:
-  virtual void setSequence(::javax::sound::midi::Sequence *) = 0;
-  virtual void setSequence(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::midi::Sequence * getSequence() = 0;
-  virtual void start() = 0;
-  virtual void stop() = 0;
-  virtual jboolean isRunning() = 0;
-  virtual void startRecording() = 0;
-  virtual void stopRecording() = 0;
-  virtual jboolean isRecording() = 0;
-  virtual void recordEnable(::javax::sound::midi::Track *, jint) = 0;
-  virtual void recordDisable(::javax::sound::midi::Track *) = 0;
-  virtual jfloat getTempoInBPM() = 0;
-  virtual void setTempoInBPM(jfloat) = 0;
-  virtual jfloat getTempoInMPQ() = 0;
-  virtual void setTempoInMPQ(jfloat) = 0;
-  virtual void setTempoFactor(jfloat) = 0;
-  virtual jfloat getTempoFactor() = 0;
-  virtual jlong getTickLength() = 0;
-  virtual jlong getTickPosition() = 0;
-  virtual void setTickPosition(jlong) = 0;
-  virtual jlong getMicrosecondLength() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual void setMicrosecondPosition(jlong) = 0;
-  virtual void setMasterSyncMode(::javax::sound::midi::Sequencer$SyncMode *) = 0;
-  virtual ::javax::sound::midi::Sequencer$SyncMode * getMasterSyncMode() = 0;
-  virtual JArray< ::javax::sound::midi::Sequencer$SyncMode * > * getMasterSyncModes() = 0;
-  virtual void setSlaveSyncMode(::javax::sound::midi::Sequencer$SyncMode *) = 0;
-  virtual ::javax::sound::midi::Sequencer$SyncMode * getSlaveSyncMode() = 0;
-  virtual JArray< ::javax::sound::midi::Sequencer$SyncMode * > * getSlaveSyncModes() = 0;
-  virtual void setTrackMute(jint, jboolean) = 0;
-  virtual jboolean getTrackMute(jint) = 0;
-  virtual void setTrackSolo(jint, jboolean) = 0;
-  virtual jboolean getTrackSolo(jint) = 0;
-  virtual jboolean addMetaEventListener(::javax::sound::midi::MetaEventListener *) = 0;
-  virtual void removeMetaEventListener(::javax::sound::midi::MetaEventListener *) = 0;
-  virtual JArray< jint > * addControllerEventListener(::javax::sound::midi::ControllerEventListener *, JArray< jint > *) = 0;
-  virtual JArray< jint > * removeControllerEventListener(::javax::sound::midi::ControllerEventListener *, JArray< jint > *) = 0;
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo() = 0;
-  virtual void open() = 0;
-  virtual void close() = 0;
-  virtual jboolean isOpen() = 0;
-  virtual jint getMaxReceivers() = 0;
-  virtual jint getMaxTransmitters() = 0;
-  virtual ::javax::sound::midi::Receiver * getReceiver() = 0;
-  virtual ::javax::sound::midi::Transmitter * getTransmitter() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Sequencer__
diff --git a/libjava/javax/sound/midi/ShortMessage.h b/libjava/javax/sound/midi/ShortMessage.h
deleted file mode 100644
index 7a5872cd8ec..00000000000
--- a/libjava/javax/sound/midi/ShortMessage.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_ShortMessage__
-#define __javax_sound_midi_ShortMessage__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiMessage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class ShortMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::ShortMessage : public ::javax::sound::midi::MidiMessage
-{
-
-public:
-  ShortMessage();
-public: // actually protected
-  ShortMessage(JArray< jbyte > *);
-public:
-  virtual void setMessage(jint, jint, jint);
-  virtual void setMessage(jint, jint, jint, jint);
-  virtual void setMessage(jint);
-public: // actually protected
-  virtual jint getDataLength(jint);
-public:
-  virtual jint getChannel();
-  virtual jint getCommand();
-  virtual jint getData1();
-  virtual jint getData2();
-  virtual ::java::lang::Object * clone();
-  static const jint MIDI_TIME_CODE = 241;
-  static const jint SONG_POSITION_POINTER = 242;
-  static const jint SONG_SELECT = 243;
-  static const jint TUNE_REQUEST = 246;
-  static const jint END_OF_EXCLUSIVE = 247;
-  static const jint TIMING_CLOCK = 248;
-  static const jint START = 250;
-  static const jint CONTINUE = 251;
-  static const jint STOP = 252;
-  static const jint ACTIVE_SENSING = 254;
-  static const jint SYSTEM_RESET = 255;
-  static const jint NOTE_OFF = 128;
-  static const jint NOTE_ON = 144;
-  static const jint POLY_PRESSURE = 160;
-  static const jint CONTROL_CHANGE = 176;
-  static const jint PROGRAM_CHANGE = 192;
-  static const jint CHANNEL_PRESSURE = 208;
-  static const jint PITCH_BEND = 224;
-private:
-  static JArray< jbyte > * defaultMessage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_ShortMessage__
diff --git a/libjava/javax/sound/midi/Soundbank.h b/libjava/javax/sound/midi/Soundbank.h
deleted file mode 100644
index 8890388b827..00000000000
--- a/libjava/javax/sound/midi/Soundbank.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Soundbank__
-#define __javax_sound_midi_Soundbank__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Instrument;
-          class Patch;
-          class Soundbank;
-          class SoundbankResource;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Soundbank : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::String * getVersion() = 0;
-  virtual ::java::lang::String * getVendor() = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual JArray< ::javax::sound::midi::SoundbankResource * > * getResources() = 0;
-  virtual JArray< ::javax::sound::midi::Instrument * > * getInstruments() = 0;
-  virtual ::javax::sound::midi::Instrument * getInstrument(::javax::sound::midi::Patch *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Soundbank__
diff --git a/libjava/javax/sound/midi/SoundbankResource.h b/libjava/javax/sound/midi/SoundbankResource.h
deleted file mode 100644
index 19562681035..00000000000
--- a/libjava/javax/sound/midi/SoundbankResource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_SoundbankResource__
-#define __javax_sound_midi_SoundbankResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Soundbank;
-          class SoundbankResource;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::SoundbankResource : public ::java::lang::Object
-{
-
-public: // actually protected
-  SoundbankResource(::javax::sound::midi::Soundbank *, ::java::lang::String *, ::java::lang::Class *);
-public:
-  virtual ::javax::sound::midi::Soundbank * getSoundbank();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::Class * getDataClass();
-  virtual ::java::lang::Object * getData() = 0;
-private:
-  ::javax::sound::midi::Soundbank * __attribute__((aligned(__alignof__( ::java::lang::Object)))) soundbank;
-  ::java::lang::String * name;
-  ::java::lang::Class * dataClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_SoundbankResource__
diff --git a/libjava/javax/sound/midi/Synthesizer.h b/libjava/javax/sound/midi/Synthesizer.h
deleted file mode 100644
index 1ccc094bed0..00000000000
--- a/libjava/javax/sound/midi/Synthesizer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Synthesizer__
-#define __javax_sound_midi_Synthesizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Instrument;
-          class MidiChannel;
-          class MidiDevice$Info;
-          class Patch;
-          class Receiver;
-          class Soundbank;
-          class Synthesizer;
-          class Transmitter;
-          class VoiceStatus;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Synthesizer : public ::java::lang::Object
-{
-
-public:
-  virtual jint getMaxPolyphony() = 0;
-  virtual jlong getLatency() = 0;
-  virtual JArray< ::javax::sound::midi::MidiChannel * > * getChannels() = 0;
-  virtual JArray< ::javax::sound::midi::VoiceStatus * > * getVoiceStatus() = 0;
-  virtual jboolean isSoundbankSupported(::javax::sound::midi::Soundbank *) = 0;
-  virtual jboolean loadInstrument(::javax::sound::midi::Instrument *) = 0;
-  virtual void unloadInstrument(::javax::sound::midi::Instrument *) = 0;
-  virtual jboolean remapInstrument(::javax::sound::midi::Instrument *, ::javax::sound::midi::Instrument *) = 0;
-  virtual ::javax::sound::midi::Soundbank * getDefaultSoundbank() = 0;
-  virtual JArray< ::javax::sound::midi::Instrument * > * getAvailableInstruments() = 0;
-  virtual JArray< ::javax::sound::midi::Instrument * > * getLoadedInstruments() = 0;
-  virtual jboolean loadAllInstruments(::javax::sound::midi::Soundbank *) = 0;
-  virtual void unloadAllInstruments(::javax::sound::midi::Soundbank *) = 0;
-  virtual jboolean loadInstruments(::javax::sound::midi::Soundbank *, JArray< ::javax::sound::midi::Patch * > *) = 0;
-  virtual void unloadInstruments(::javax::sound::midi::Soundbank *, JArray< ::javax::sound::midi::Patch * > *) = 0;
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo() = 0;
-  virtual void open() = 0;
-  virtual void close() = 0;
-  virtual jboolean isOpen() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual jint getMaxReceivers() = 0;
-  virtual jint getMaxTransmitters() = 0;
-  virtual ::javax::sound::midi::Receiver * getReceiver() = 0;
-  virtual ::javax::sound::midi::Transmitter * getTransmitter() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Synthesizer__
diff --git a/libjava/javax/sound/midi/SysexMessage.h b/libjava/javax/sound/midi/SysexMessage.h
deleted file mode 100644
index e6901f283d6..00000000000
--- a/libjava/javax/sound/midi/SysexMessage.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_SysexMessage__
-#define __javax_sound_midi_SysexMessage__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiMessage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class SysexMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::SysexMessage : public ::javax::sound::midi::MidiMessage
-{
-
-public:
-  SysexMessage();
-public: // actually protected
-  SysexMessage(JArray< jbyte > *);
-public:
-  virtual void setMessage(JArray< jbyte > *, jint);
-  virtual void setMessage(jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * getData();
-  virtual ::java::lang::Object * clone();
-  static const jint SYSTEM_EXCLUSIVE = 240;
-  static const jint SPECIAL_SYSTEM_EXCLUSIVE = 247;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_SysexMessage__
diff --git a/libjava/javax/sound/midi/Track.h b/libjava/javax/sound/midi/Track.h
deleted file mode 100644
index 9f544596541..00000000000
--- a/libjava/javax/sound/midi/Track.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Track__
-#define __javax_sound_midi_Track__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiEvent;
-          class Track;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Track : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Track();
-public:
-  virtual jboolean add(::javax::sound::midi::MidiEvent *);
-  virtual jboolean remove(::javax::sound::midi::MidiEvent *);
-  virtual ::javax::sound::midi::MidiEvent * get(jint);
-  virtual jint size();
-  virtual jlong ticks();
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) events;
-private:
-  ::java::util::HashSet * eventSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Track__
diff --git a/libjava/javax/sound/midi/Transmitter.h b/libjava/javax/sound/midi/Transmitter.h
deleted file mode 100644
index 039f311bdf3..00000000000
--- a/libjava/javax/sound/midi/Transmitter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Transmitter__
-#define __javax_sound_midi_Transmitter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Receiver;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Transmitter : public ::java::lang::Object
-{
-
-public:
-  virtual void setReceiver(::javax::sound::midi::Receiver *) = 0;
-  virtual ::javax::sound::midi::Receiver * getReceiver() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Transmitter__
diff --git a/libjava/javax/sound/midi/VoiceStatus.h b/libjava/javax/sound/midi/VoiceStatus.h
deleted file mode 100644
index 6e25a3457d1..00000000000
--- a/libjava/javax/sound/midi/VoiceStatus.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_VoiceStatus__
-#define __javax_sound_midi_VoiceStatus__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class VoiceStatus;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::VoiceStatus : public ::java::lang::Object
-{
-
-public:
-  VoiceStatus();
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) active;
-  jint channel;
-  jint bank;
-  jint program;
-  jint note;
-  jint volume;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_VoiceStatus__
diff --git a/libjava/javax/sound/midi/spi/MidiDeviceProvider.h b/libjava/javax/sound/midi/spi/MidiDeviceProvider.h
deleted file mode 100644
index 3e172aa55a9..00000000000
--- a/libjava/javax/sound/midi/spi/MidiDeviceProvider.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_spi_MidiDeviceProvider__
-#define __javax_sound_midi_spi_MidiDeviceProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-          class MidiDevice$Info;
-        namespace spi
-        {
-            class MidiDeviceProvider;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::midi::spi::MidiDeviceProvider : public ::java::lang::Object
-{
-
-public:
-  MidiDeviceProvider();
-  virtual jboolean isDeviceSupported(::javax::sound::midi::MidiDevice$Info *);
-  virtual JArray< ::javax::sound::midi::MidiDevice$Info * > * getDeviceInfo() = 0;
-  virtual ::javax::sound::midi::MidiDevice * getDevice(::javax::sound::midi::MidiDevice$Info *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_spi_MidiDeviceProvider__
diff --git a/libjava/javax/sound/midi/spi/MidiFileReader.h b/libjava/javax/sound/midi/spi/MidiFileReader.h
deleted file mode 100644
index a389294bb15..00000000000
--- a/libjava/javax/sound/midi/spi/MidiFileReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_spi_MidiFileReader__
-#define __javax_sound_midi_spi_MidiFileReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiFileFormat;
-          class Sequence;
-        namespace spi
-        {
-            class MidiFileReader;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::midi::spi::MidiFileReader : public ::java::lang::Object
-{
-
-public:
-  MidiFileReader();
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::net::URL *) = 0;
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::File *) = 0;
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::net::URL *) = 0;
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_spi_MidiFileReader__
diff --git a/libjava/javax/sound/midi/spi/MidiFileWriter.h b/libjava/javax/sound/midi/spi/MidiFileWriter.h
deleted file mode 100644
index d5144faae97..00000000000
--- a/libjava/javax/sound/midi/spi/MidiFileWriter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_spi_MidiFileWriter__
-#define __javax_sound_midi_spi_MidiFileWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Sequence;
-        namespace spi
-        {
-            class MidiFileWriter;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::midi::spi::MidiFileWriter : public ::java::lang::Object
-{
-
-public:
-  MidiFileWriter();
-  virtual JArray< jint > * getMidiFileTypes() = 0;
-  virtual JArray< jint > * getMidiFileTypes(::javax::sound::midi::Sequence *) = 0;
-  virtual jboolean isFileTypeSupported(jint);
-  virtual jboolean isFileTypeSupported(jint, ::javax::sound::midi::Sequence *);
-  virtual jint write(::javax::sound::midi::Sequence *, jint, ::java::io::OutputStream *) = 0;
-  virtual jint write(::javax::sound::midi::Sequence *, jint, ::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_spi_MidiFileWriter__
diff --git a/libjava/javax/sound/midi/spi/SoundbankReader.h b/libjava/javax/sound/midi/spi/SoundbankReader.h
deleted file mode 100644
index a12e20b9fe8..00000000000
--- a/libjava/javax/sound/midi/spi/SoundbankReader.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_spi_SoundbankReader__
-#define __javax_sound_midi_spi_SoundbankReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Soundbank;
-        namespace spi
-        {
-            class SoundbankReader;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::midi::spi::SoundbankReader : public ::java::lang::Object
-{
-
-public:
-  SoundbankReader();
-  virtual ::javax::sound::midi::Soundbank * getSoundbank(::java::net::URL *) = 0;
-  virtual ::javax::sound::midi::Soundbank * getSoundbank(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::midi::Soundbank * getSoundbank(::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_spi_SoundbankReader__
diff --git a/libjava/javax/sound/sampled/AudioFileFormat$Type.h b/libjava/javax/sound/sampled/AudioFileFormat$Type.h
deleted file mode 100644
index cc44a55b8ec..00000000000
--- a/libjava/javax/sound/sampled/AudioFileFormat$Type.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioFileFormat$Type__
-#define __javax_sound_sampled_AudioFileFormat$Type__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioFileFormat$Type : public ::java::lang::Object
-{
-
-public:
-  AudioFileFormat$Type(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getExtension();
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::sampled::AudioFileFormat$Type * AIFC;
-  static ::javax::sound::sampled::AudioFileFormat$Type * AIFF;
-  static ::javax::sound::sampled::AudioFileFormat$Type * AU;
-  static ::javax::sound::sampled::AudioFileFormat$Type * SND;
-  static ::javax::sound::sampled::AudioFileFormat$Type * WAVE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * extension;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioFileFormat$Type__
diff --git a/libjava/javax/sound/sampled/AudioFileFormat.h b/libjava/javax/sound/sampled/AudioFileFormat.h
deleted file mode 100644
index f5171f516f7..00000000000
--- a/libjava/javax/sound/sampled/AudioFileFormat.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioFileFormat__
-#define __javax_sound_sampled_AudioFileFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioFileFormat$Type;
-          class AudioFormat;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioFileFormat : public ::java::lang::Object
-{
-
-public:
-  AudioFileFormat(::javax::sound::sampled::AudioFileFormat$Type *, ::javax::sound::sampled::AudioFormat *, jint);
-  AudioFileFormat(::javax::sound::sampled::AudioFileFormat$Type *, ::javax::sound::sampled::AudioFormat *, jint, ::java::util::Map *);
-public: // actually protected
-  AudioFileFormat(::javax::sound::sampled::AudioFileFormat$Type *, jint, ::javax::sound::sampled::AudioFormat *, jint);
-public:
-  virtual jint getByteLength();
-  virtual ::javax::sound::sampled::AudioFormat * getFormat();
-  virtual jint getFrameLength();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual ::javax::sound::sampled::AudioFileFormat$Type * getType();
-  virtual ::java::util::Map * properties();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) byteLength;
-  ::javax::sound::sampled::AudioFormat * format;
-  ::javax::sound::sampled::AudioFileFormat$Type * type;
-  jint frameLength;
-  ::java::util::Map * properties__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioFileFormat__
diff --git a/libjava/javax/sound/sampled/AudioFormat$Encoding.h b/libjava/javax/sound/sampled/AudioFormat$Encoding.h
deleted file mode 100644
index 74b37793d67..00000000000
--- a/libjava/javax/sound/sampled/AudioFormat$Encoding.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioFormat$Encoding__
-#define __javax_sound_sampled_AudioFormat$Encoding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat$Encoding;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioFormat$Encoding : public ::java::lang::Object
-{
-
-public:
-  AudioFormat$Encoding(::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::sampled::AudioFormat$Encoding * ALAW;
-  static ::javax::sound::sampled::AudioFormat$Encoding * PCM_SIGNED;
-  static ::javax::sound::sampled::AudioFormat$Encoding * PCM_UNSIGNED;
-  static ::javax::sound::sampled::AudioFormat$Encoding * ULAW;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioFormat$Encoding__
diff --git a/libjava/javax/sound/sampled/AudioFormat.h b/libjava/javax/sound/sampled/AudioFormat.h
deleted file mode 100644
index 5166524d9f8..00000000000
--- a/libjava/javax/sound/sampled/AudioFormat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioFormat__
-#define __javax_sound_sampled_AudioFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioFormat$Encoding;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioFormat : public ::java::lang::Object
-{
-
-public:
-  AudioFormat(::javax::sound::sampled::AudioFormat$Encoding *, jfloat, jint, jint, jint, jfloat, jboolean);
-  AudioFormat(::javax::sound::sampled::AudioFormat$Encoding *, jfloat, jint, jint, jint, jfloat, jboolean, ::java::util::Map *);
-  AudioFormat(jfloat, jint, jint, jboolean, jboolean);
-  virtual jint getChannels();
-  virtual ::javax::sound::sampled::AudioFormat$Encoding * getEncoding();
-  virtual jfloat getFrameRate();
-  virtual jint getFrameSize();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual jfloat getSampleRate();
-  virtual jint getSampleSizeInBits();
-  virtual jboolean isBigEndian();
-  virtual jboolean matches(::javax::sound::sampled::AudioFormat *);
-  virtual ::java::util::Map * properties();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) bigEndian;
-  jint channels;
-  ::javax::sound::sampled::AudioFormat$Encoding * encoding;
-  jfloat frameRate;
-  jint frameSize;
-  jfloat sampleRate;
-  jint sampleSizeInBits;
-private:
-  ::java::util::Map * properties__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioFormat__
diff --git a/libjava/javax/sound/sampled/AudioInputStream$TargetInputStream.h b/libjava/javax/sound/sampled/AudioInputStream$TargetInputStream.h
deleted file mode 100644
index a4d4b195d9c..00000000000
--- a/libjava/javax/sound/sampled/AudioInputStream$TargetInputStream.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioInputStream$TargetInputStream__
-#define __javax_sound_sampled_AudioInputStream$TargetInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioInputStream$TargetInputStream;
-          class TargetDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioInputStream$TargetInputStream : public ::java::io::InputStream
-{
-
-public:
-  AudioInputStream$TargetInputStream(::javax::sound::sampled::TargetDataLine *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  ::javax::sound::sampled::TargetDataLine * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) line;
-  JArray< jbyte > * buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioInputStream$TargetInputStream__
diff --git a/libjava/javax/sound/sampled/AudioInputStream.h b/libjava/javax/sound/sampled/AudioInputStream.h
deleted file mode 100644
index 5e07e8dc1a7..00000000000
--- a/libjava/javax/sound/sampled/AudioInputStream.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioInputStream__
-#define __javax_sound_sampled_AudioInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioInputStream;
-          class TargetDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioInputStream : public ::java::io::InputStream
-{
-
-public:
-  AudioInputStream(::java::io::InputStream *, ::javax::sound::sampled::AudioFormat *, jlong);
-  AudioInputStream(::javax::sound::sampled::TargetDataLine *);
-  virtual jint available();
-  virtual void close();
-  virtual ::javax::sound::sampled::AudioFormat * getFormat();
-  virtual jlong getFrameLength();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-public: // actually protected
-  ::javax::sound::sampled::AudioFormat * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) format;
-  jlong frameLength;
-  jlong framePos;
-  jint frameSize;
-private:
-  ::java::io::InputStream * input;
-  jlong markedFramePos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioInputStream__
diff --git a/libjava/javax/sound/sampled/AudioPermission.h b/libjava/javax/sound/sampled/AudioPermission.h
deleted file mode 100644
index e83637b5033..00000000000
--- a/libjava/javax/sound/sampled/AudioPermission.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioPermission__
-#define __javax_sound_sampled_AudioPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioPermission;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioPermission : public ::java::security::BasicPermission
-{
-
-public:
-  AudioPermission(::java::lang::String *);
-  AudioPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5518053473477801126LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioPermission__
diff --git a/libjava/javax/sound/sampled/AudioSystem.h b/libjava/javax/sound/sampled/AudioSystem.h
deleted file mode 100644
index 9b490ded804..00000000000
--- a/libjava/javax/sound/sampled/AudioSystem.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioSystem__
-#define __javax_sound_sampled_AudioSystem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioFileFormat$Type;
-          class AudioFormat;
-          class AudioFormat$Encoding;
-          class AudioInputStream;
-          class AudioSystem;
-          class Clip;
-          class Line;
-          class Line$Info;
-          class Mixer;
-          class Mixer$Info;
-          class SourceDataLine;
-          class TargetDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioSystem : public ::java::lang::Object
-{
-
-  AudioSystem();
-public:
-  static ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *);
-  static ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *);
-  static ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *);
-  static JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes();
-  static JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes(::javax::sound::sampled::AudioInputStream *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioInputStream *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::AudioInputStream *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::net::URL *);
-  static ::javax::sound::sampled::Clip * getClip();
-  static ::javax::sound::sampled::Clip * getClip(::javax::sound::sampled::Mixer$Info *);
-  static ::javax::sound::sampled::Line * getLine(::javax::sound::sampled::Line$Info *);
-  static ::javax::sound::sampled::Mixer * getMixer(::javax::sound::sampled::Mixer$Info *);
-  static JArray< ::javax::sound::sampled::Mixer$Info * > * getMixerInfo();
-  static ::javax::sound::sampled::SourceDataLine * getSourceDataLine(::javax::sound::sampled::AudioFormat *);
-  static ::javax::sound::sampled::SourceDataLine * getSourceDataLine(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::Mixer$Info *);
-  static JArray< ::javax::sound::sampled::Line$Info * > * getSourceLineInfo(::javax::sound::sampled::Line$Info *);
-  static ::javax::sound::sampled::TargetDataLine * getTargetDataLine(::javax::sound::sampled::AudioFormat *);
-  static ::javax::sound::sampled::TargetDataLine * getTargetDataLine(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::Mixer$Info *);
-  static JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getTargetEncodings(::javax::sound::sampled::AudioFormat$Encoding *);
-  static JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getTargetEncodings(::javax::sound::sampled::AudioFormat *);
-  static JArray< ::javax::sound::sampled::AudioFormat * > * getTargetFormats(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioFormat *);
-  static JArray< ::javax::sound::sampled::Line$Info * > * getTargetLineInfo(::javax::sound::sampled::Line$Info *);
-  static jboolean isConversionSupported(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioFormat *);
-  static jboolean isConversionSupported(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::AudioFormat *);
-private:
-  static jboolean isFileTypeSupported(JArray< ::javax::sound::sampled::AudioFileFormat$Type * > *, ::javax::sound::sampled::AudioFileFormat$Type *);
-public:
-  static jboolean isFileTypeSupported(::javax::sound::sampled::AudioFileFormat$Type *);
-  static jboolean isFileTypeSupported(::javax::sound::sampled::AudioFileFormat$Type *, ::javax::sound::sampled::AudioInputStream *);
-  static jboolean isLineSupported(::javax::sound::sampled::Line$Info *);
-  static jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::File *);
-  static jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::OutputStream *);
-  static const jint NOT_SPECIFIED = -1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioSystem__
diff --git a/libjava/javax/sound/sampled/BooleanControl$Type.h b/libjava/javax/sound/sampled/BooleanControl$Type.h
deleted file mode 100644
index a7058efe4ae..00000000000
--- a/libjava/javax/sound/sampled/BooleanControl$Type.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_BooleanControl$Type__
-#define __javax_sound_sampled_BooleanControl$Type__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control$Type.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class BooleanControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::BooleanControl$Type : public ::javax::sound::sampled::Control$Type
-{
-
-public: // actually protected
-  BooleanControl$Type(::java::lang::String *);
-public:
-  static ::javax::sound::sampled::BooleanControl$Type * APPLY_REVERB;
-  static ::javax::sound::sampled::BooleanControl$Type * MUTE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_BooleanControl$Type__
diff --git a/libjava/javax/sound/sampled/BooleanControl.h b/libjava/javax/sound/sampled/BooleanControl.h
deleted file mode 100644
index eca5d354885..00000000000
--- a/libjava/javax/sound/sampled/BooleanControl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_BooleanControl__
-#define __javax_sound_sampled_BooleanControl__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class BooleanControl;
-          class BooleanControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::BooleanControl : public ::javax::sound::sampled::Control
-{
-
-public: // actually protected
-  BooleanControl(::javax::sound::sampled::BooleanControl$Type *, jboolean);
-  BooleanControl(::javax::sound::sampled::BooleanControl$Type *, jboolean, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getStateLabel(jboolean);
-  virtual jboolean getValue();
-  virtual void setValue(jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) value;
-  ::java::lang::String * trueLabel;
-  ::java::lang::String * falseLabel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_BooleanControl__
diff --git a/libjava/javax/sound/sampled/Clip.h b/libjava/javax/sound/sampled/Clip.h
deleted file mode 100644
index ab6c5582812..00000000000
--- a/libjava/javax/sound/sampled/Clip.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Clip__
-#define __javax_sound_sampled_Clip__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioInputStream;
-          class Clip;
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Clip : public ::java::lang::Object
-{
-
-public:
-  virtual jint getFrameLength() = 0;
-  virtual jlong getMicrosecondLength() = 0;
-  virtual void loop(jint) = 0;
-  virtual void open(::javax::sound::sampled::AudioFormat *, JArray< jbyte > *, jint, jint) = 0;
-  virtual void open(::javax::sound::sampled::AudioInputStream *) = 0;
-  virtual void setFramePosition(jint) = 0;
-  virtual void setLoopPoints(jint, jint) = 0;
-  virtual void setMicrosecondPosition(jlong) = 0;
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getBufferSize() = 0;
-  virtual ::javax::sound::sampled::AudioFormat * getFormat() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jfloat getLevel() = 0;
-  virtual jlong getLongFramePosition() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual jboolean isActive() = 0;
-  virtual jboolean isRunning() = 0;
-  virtual void start() = 0;
-  virtual void stop() = 0;
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static const jint LOOP_CONTINUOUSLY = -1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_Clip__
diff --git a/libjava/javax/sound/sampled/CompoundControl$Type.h b/libjava/javax/sound/sampled/CompoundControl$Type.h
deleted file mode 100644
index ccbf51f1dd9..00000000000
--- a/libjava/javax/sound/sampled/CompoundControl$Type.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_CompoundControl$Type__
-#define __javax_sound_sampled_CompoundControl$Type__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control$Type.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class CompoundControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::CompoundControl$Type : public ::javax::sound::sampled::Control$Type
-{
-
-public: // actually protected
-  CompoundControl$Type(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_CompoundControl$Type__
diff --git a/libjava/javax/sound/sampled/CompoundControl.h b/libjava/javax/sound/sampled/CompoundControl.h
deleted file mode 100644
index d4438e56d62..00000000000
--- a/libjava/javax/sound/sampled/CompoundControl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_CompoundControl__
-#define __javax_sound_sampled_CompoundControl__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class CompoundControl;
-          class CompoundControl$Type;
-          class Control;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::CompoundControl : public ::javax::sound::sampled::Control
-{
-
-public: // actually protected
-  CompoundControl(::javax::sound::sampled::CompoundControl$Type *, JArray< ::javax::sound::sampled::Control * > *);
-public:
-  virtual JArray< ::javax::sound::sampled::Control * > * getMemberControls();
-  virtual ::java::lang::String * toString();
-private:
-  JArray< ::javax::sound::sampled::Control * > * __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) memberControls;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_CompoundControl__
diff --git a/libjava/javax/sound/sampled/Control$Type.h b/libjava/javax/sound/sampled/Control$Type.h
deleted file mode 100644
index cf7043abe6a..00000000000
--- a/libjava/javax/sound/sampled/Control$Type.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Control$Type__
-#define __javax_sound_sampled_Control$Type__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Control$Type : public ::java::lang::Object
-{
-
-public: // actually protected
-  Control$Type(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Control$Type__
diff --git a/libjava/javax/sound/sampled/Control.h b/libjava/javax/sound/sampled/Control.h
deleted file mode 100644
index 59dc5b14b81..00000000000
--- a/libjava/javax/sound/sampled/Control.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Control__
-#define __javax_sound_sampled_Control__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Control : public ::java::lang::Object
-{
-
-public: // actually protected
-  Control(::javax::sound::sampled::Control$Type *);
-public:
-  virtual ::javax::sound::sampled::Control$Type * getType();
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::sound::sampled::Control$Type * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Control__
diff --git a/libjava/javax/sound/sampled/DataLine$Info.h b/libjava/javax/sound/sampled/DataLine$Info.h
deleted file mode 100644
index ea6322eae57..00000000000
--- a/libjava/javax/sound/sampled/DataLine$Info.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_DataLine$Info__
-#define __javax_sound_sampled_DataLine$Info__
-
-#pragma interface
-
-#include <javax/sound/sampled/Line$Info.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class DataLine$Info;
-          class Line$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::DataLine$Info : public ::javax::sound::sampled::Line$Info
-{
-
-public:
-  DataLine$Info(::java::lang::Class *, ::javax::sound::sampled::AudioFormat *);
-  DataLine$Info(::java::lang::Class *, JArray< ::javax::sound::sampled::AudioFormat * > *, jint, jint);
-  DataLine$Info(::java::lang::Class *, ::javax::sound::sampled::AudioFormat *, jint);
-  virtual JArray< ::javax::sound::sampled::AudioFormat * > * getFormats();
-  virtual jint getMaxBufferSize();
-  virtual jint getMinBufferSize();
-  virtual jboolean isFormatSupported(::javax::sound::sampled::AudioFormat *);
-  virtual jboolean matches(::javax::sound::sampled::Line$Info *);
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::sound::sampled::Line$Info)))) minBufferSize;
-  jint maxBufferSize;
-  JArray< ::javax::sound::sampled::AudioFormat * > * formats;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_DataLine$Info__
diff --git a/libjava/javax/sound/sampled/DataLine.h b/libjava/javax/sound/sampled/DataLine.h
deleted file mode 100644
index 257fd9b7781..00000000000
--- a/libjava/javax/sound/sampled/DataLine.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_DataLine__
-#define __javax_sound_sampled_DataLine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class Control;
-          class Control$Type;
-          class DataLine;
-          class Line$Info;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::DataLine : public ::java::lang::Object
-{
-
-public:
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getBufferSize() = 0;
-  virtual ::javax::sound::sampled::AudioFormat * getFormat() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jfloat getLevel() = 0;
-  virtual jlong getLongFramePosition() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual jboolean isActive() = 0;
-  virtual jboolean isRunning() = 0;
-  virtual void start() = 0;
-  virtual void stop() = 0;
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_DataLine__
diff --git a/libjava/javax/sound/sampled/EnumControl$Type.h b/libjava/javax/sound/sampled/EnumControl$Type.h
deleted file mode 100644
index dce2cc12f62..00000000000
--- a/libjava/javax/sound/sampled/EnumControl$Type.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_EnumControl$Type__
-#define __javax_sound_sampled_EnumControl$Type__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control$Type.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class EnumControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::EnumControl$Type : public ::javax::sound::sampled::Control$Type
-{
-
-public: // actually protected
-  EnumControl$Type(::java::lang::String *);
-public:
-  static ::javax::sound::sampled::EnumControl$Type * REVERB;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_EnumControl$Type__
diff --git a/libjava/javax/sound/sampled/EnumControl.h b/libjava/javax/sound/sampled/EnumControl.h
deleted file mode 100644
index 618d19c16de..00000000000
--- a/libjava/javax/sound/sampled/EnumControl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_EnumControl__
-#define __javax_sound_sampled_EnumControl__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class EnumControl;
-          class EnumControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::EnumControl : public ::javax::sound::sampled::Control
-{
-
-public: // actually protected
-  EnumControl(::javax::sound::sampled::EnumControl$Type *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-public:
-  virtual ::java::lang::Object * getValue();
-  virtual JArray< ::java::lang::Object * > * getValues();
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) values;
-  ::java::lang::Object * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_EnumControl__
diff --git a/libjava/javax/sound/sampled/FloatControl$Type.h b/libjava/javax/sound/sampled/FloatControl$Type.h
deleted file mode 100644
index d14a4f9f10b..00000000000
--- a/libjava/javax/sound/sampled/FloatControl$Type.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_FloatControl$Type__
-#define __javax_sound_sampled_FloatControl$Type__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control$Type.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class FloatControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::FloatControl$Type : public ::javax::sound::sampled::Control$Type
-{
-
-public: // actually protected
-  FloatControl$Type(::java::lang::String *);
-public:
-  static ::javax::sound::sampled::FloatControl$Type * AUX_RETURN;
-  static ::javax::sound::sampled::FloatControl$Type * AUX_SEND;
-  static ::javax::sound::sampled::FloatControl$Type * BALANCE;
-  static ::javax::sound::sampled::FloatControl$Type * MASTER_GAIN;
-  static ::javax::sound::sampled::FloatControl$Type * PAN;
-  static ::javax::sound::sampled::FloatControl$Type * REVERB_RETURN;
-  static ::javax::sound::sampled::FloatControl$Type * REVERB_SEND;
-  static ::javax::sound::sampled::FloatControl$Type * SAMPLE_RATE;
-  static ::javax::sound::sampled::FloatControl$Type * VOLUME;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_FloatControl$Type__
diff --git a/libjava/javax/sound/sampled/FloatControl.h b/libjava/javax/sound/sampled/FloatControl.h
deleted file mode 100644
index 3a7da025b9b..00000000000
--- a/libjava/javax/sound/sampled/FloatControl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_FloatControl__
-#define __javax_sound_sampled_FloatControl__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class FloatControl;
-          class FloatControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::FloatControl : public ::javax::sound::sampled::Control
-{
-
-public: // actually protected
-  FloatControl(::javax::sound::sampled::FloatControl$Type *, jfloat, jfloat, jfloat, jint, jfloat, ::java::lang::String *);
-  FloatControl(::javax::sound::sampled::FloatControl$Type *, jfloat, jfloat, jfloat, jint, jfloat, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jfloat getMaximum();
-  virtual ::java::lang::String * getMaxLabel();
-  virtual ::java::lang::String * getMidLabel();
-  virtual jfloat getMinimum();
-  virtual ::java::lang::String * getMinLabel();
-  virtual jfloat getPrecision();
-  virtual ::java::lang::String * getUnits();
-  virtual jint getUpdatePeriod();
-  virtual jfloat getValue();
-  virtual void setValue(jfloat);
-  virtual void shift(jfloat, jfloat, jint);
-  virtual ::java::lang::String * toString();
-private:
-  jfloat __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) minimum;
-  jfloat maximum;
-  jfloat precision;
-  jint updatePeriod;
-  jfloat value;
-  ::java::lang::String * units;
-  ::java::lang::String * minLabel;
-  ::java::lang::String * maxLabel;
-  ::java::lang::String * midLabel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_FloatControl__
diff --git a/libjava/javax/sound/sampled/Line$Info.h b/libjava/javax/sound/sampled/Line$Info.h
deleted file mode 100644
index 982c0273204..00000000000
--- a/libjava/javax/sound/sampled/Line$Info.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Line$Info__
-#define __javax_sound_sampled_Line$Info__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Line$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Line$Info : public ::java::lang::Object
-{
-
-public:
-  Line$Info(::java::lang::Class *);
-  virtual ::java::lang::Class * getLineClass();
-  virtual jboolean matches(::javax::sound::sampled::Line$Info *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) klass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Line$Info__
diff --git a/libjava/javax/sound/sampled/Line.h b/libjava/javax/sound/sampled/Line.h
deleted file mode 100644
index 7f6552d8d87..00000000000
--- a/libjava/javax/sound/sampled/Line.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Line__
-#define __javax_sound_sampled_Line__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-          class Line;
-          class Line$Info;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Line : public ::java::lang::Object
-{
-
-public:
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_Line__
diff --git a/libjava/javax/sound/sampled/LineEvent$Type.h b/libjava/javax/sound/sampled/LineEvent$Type.h
deleted file mode 100644
index c509deca221..00000000000
--- a/libjava/javax/sound/sampled/LineEvent$Type.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_LineEvent$Type__
-#define __javax_sound_sampled_LineEvent$Type__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class LineEvent$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::LineEvent$Type : public ::java::lang::Object
-{
-
-public: // actually protected
-  LineEvent$Type(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::sampled::LineEvent$Type * CLOSE;
-  static ::javax::sound::sampled::LineEvent$Type * OPEN;
-  static ::javax::sound::sampled::LineEvent$Type * START;
-  static ::javax::sound::sampled::LineEvent$Type * STOP;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_LineEvent$Type__
diff --git a/libjava/javax/sound/sampled/LineEvent.h b/libjava/javax/sound/sampled/LineEvent.h
deleted file mode 100644
index ccc90e25dc8..00000000000
--- a/libjava/javax/sound/sampled/LineEvent.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_LineEvent__
-#define __javax_sound_sampled_LineEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Line;
-          class LineEvent;
-          class LineEvent$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::LineEvent : public ::java::util::EventObject
-{
-
-public:
-  LineEvent(::javax::sound::sampled::Line *, ::javax::sound::sampled::LineEvent$Type *, jlong);
-  virtual jlong getFramePosition();
-  virtual ::javax::sound::sampled::Line * getLine();
-  virtual ::javax::sound::sampled::LineEvent$Type * getType();
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -1274246333383880410LL;
-  ::javax::sound::sampled::LineEvent$Type * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) type;
-  jlong framePosition;
-  ::javax::sound::sampled::Line * line;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_LineEvent__
diff --git a/libjava/javax/sound/sampled/LineListener.h b/libjava/javax/sound/sampled/LineListener.h
deleted file mode 100644
index 5abbde1a870..00000000000
--- a/libjava/javax/sound/sampled/LineListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_LineListener__
-#define __javax_sound_sampled_LineListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class LineEvent;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::LineListener : public ::java::lang::Object
-{
-
-public:
-  virtual void update(::javax::sound::sampled::LineEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_LineListener__
diff --git a/libjava/javax/sound/sampled/LineUnavailableException.h b/libjava/javax/sound/sampled/LineUnavailableException.h
deleted file mode 100644
index a0068a6ec06..00000000000
--- a/libjava/javax/sound/sampled/LineUnavailableException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_LineUnavailableException__
-#define __javax_sound_sampled_LineUnavailableException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class LineUnavailableException;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::LineUnavailableException : public ::java::lang::Exception
-{
-
-public:
-  LineUnavailableException();
-  LineUnavailableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2046718279487432130LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_LineUnavailableException__
diff --git a/libjava/javax/sound/sampled/Mixer$Info.h b/libjava/javax/sound/sampled/Mixer$Info.h
deleted file mode 100644
index 81ba18b1d61..00000000000
--- a/libjava/javax/sound/sampled/Mixer$Info.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Mixer$Info__
-#define __javax_sound_sampled_Mixer$Info__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Mixer$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Mixer$Info : public ::java::lang::Object
-{
-
-public: // actually protected
-  Mixer$Info(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getVendor();
-  virtual ::java::lang::String * getVersion();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * description;
-  ::java::lang::String * vendor;
-  ::java::lang::String * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Mixer$Info__
diff --git a/libjava/javax/sound/sampled/Mixer.h b/libjava/javax/sound/sampled/Mixer.h
deleted file mode 100644
index b0bd095592a..00000000000
--- a/libjava/javax/sound/sampled/Mixer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Mixer__
-#define __javax_sound_sampled_Mixer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-          class Line;
-          class Line$Info;
-          class LineListener;
-          class Mixer;
-          class Mixer$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Mixer : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::sound::sampled::Line * getLine(::javax::sound::sampled::Line$Info *) = 0;
-  virtual jint getMaxLines(::javax::sound::sampled::Line$Info *) = 0;
-  virtual ::javax::sound::sampled::Mixer$Info * getMixerInfo() = 0;
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getSourceLineInfo() = 0;
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getSourceLineInfo(::javax::sound::sampled::Line$Info *) = 0;
-  virtual JArray< ::javax::sound::sampled::Line * > * getSourceLines() = 0;
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getTargetLineInfo() = 0;
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getTargetLineInfo(::javax::sound::sampled::Line$Info *) = 0;
-  virtual JArray< ::javax::sound::sampled::Line * > * getTargetLines() = 0;
-  virtual jboolean isLineSupported(::javax::sound::sampled::Line$Info *) = 0;
-  virtual jboolean isSynchronizationSupported(JArray< ::javax::sound::sampled::Line * > *, jboolean) = 0;
-  virtual void synchronize(JArray< ::javax::sound::sampled::Line * > *, jboolean) = 0;
-  virtual void unsynchronize(JArray< ::javax::sound::sampled::Line * > *) = 0;
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_Mixer__
diff --git a/libjava/javax/sound/sampled/Port$Info.h b/libjava/javax/sound/sampled/Port$Info.h
deleted file mode 100644
index 1635e27c31b..00000000000
--- a/libjava/javax/sound/sampled/Port$Info.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Port$Info__
-#define __javax_sound_sampled_Port$Info__
-
-#pragma interface
-
-#include <javax/sound/sampled/Line$Info.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Line$Info;
-          class Port$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Port$Info : public ::javax::sound::sampled::Line$Info
-{
-
-public:
-  Port$Info(::java::lang::Class *, ::java::lang::String *, jboolean);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getName();
-  virtual jboolean isSource();
-  virtual jboolean matches(::javax::sound::sampled::Line$Info *);
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::sampled::Port$Info * COMPACT_DISC;
-  static ::javax::sound::sampled::Port$Info * HEADPHONE;
-  static ::javax::sound::sampled::Port$Info * LINE_IN;
-  static ::javax::sound::sampled::Port$Info * LINE_OUT;
-  static ::javax::sound::sampled::Port$Info * MICROPHONE;
-  static ::javax::sound::sampled::Port$Info * SPEAKER;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::sound::sampled::Line$Info)))) name;
-  jboolean isSource__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Port$Info__
diff --git a/libjava/javax/sound/sampled/Port.h b/libjava/javax/sound/sampled/Port.h
deleted file mode 100644
index 4958786a943..00000000000
--- a/libjava/javax/sound/sampled/Port.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Port__
-#define __javax_sound_sampled_Port__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-          class Port;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Port : public ::java::lang::Object
-{
-
-public:
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_Port__
diff --git a/libjava/javax/sound/sampled/ReverbType.h b/libjava/javax/sound/sampled/ReverbType.h
deleted file mode 100644
index acdf5142cf8..00000000000
--- a/libjava/javax/sound/sampled/ReverbType.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_ReverbType__
-#define __javax_sound_sampled_ReverbType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class ReverbType;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::ReverbType : public ::java::lang::Object
-{
-
-public: // actually protected
-  ReverbType(::java::lang::String *, jint, jfloat, jint, jfloat, jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jint getDecayTime();
-  virtual jint getEarlyReflectionDelay();
-  virtual jfloat getEarlyReflectionIntensity();
-  virtual jint getLateReflectionDelay();
-  virtual jfloat getLateReflectionIntensity();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint earlyReflectionDelay;
-  jfloat earlyReflectionIntensity;
-  jint lateReflectionDelay;
-  jfloat lateReflectionIntensity;
-  jint decayTime;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_ReverbType__
diff --git a/libjava/javax/sound/sampled/SourceDataLine.h b/libjava/javax/sound/sampled/SourceDataLine.h
deleted file mode 100644
index 74b5e807631..00000000000
--- a/libjava/javax/sound/sampled/SourceDataLine.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_SourceDataLine__
-#define __javax_sound_sampled_SourceDataLine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-          class SourceDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::SourceDataLine : public ::java::lang::Object
-{
-
-public:
-  virtual void open(::javax::sound::sampled::AudioFormat *) = 0;
-  virtual void open(::javax::sound::sampled::AudioFormat *, jint) = 0;
-  virtual jint write(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getBufferSize() = 0;
-  virtual ::javax::sound::sampled::AudioFormat * getFormat() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jfloat getLevel() = 0;
-  virtual jlong getLongFramePosition() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual jboolean isActive() = 0;
-  virtual jboolean isRunning() = 0;
-  virtual void start() = 0;
-  virtual void stop() = 0;
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_SourceDataLine__
diff --git a/libjava/javax/sound/sampled/TargetDataLine.h b/libjava/javax/sound/sampled/TargetDataLine.h
deleted file mode 100644
index 18383898624..00000000000
--- a/libjava/javax/sound/sampled/TargetDataLine.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_TargetDataLine__
-#define __javax_sound_sampled_TargetDataLine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-          class TargetDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::TargetDataLine : public ::java::lang::Object
-{
-
-public:
-  virtual void open(::javax::sound::sampled::AudioFormat *) = 0;
-  virtual void open(::javax::sound::sampled::AudioFormat *, jint) = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getBufferSize() = 0;
-  virtual ::javax::sound::sampled::AudioFormat * getFormat() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jfloat getLevel() = 0;
-  virtual jlong getLongFramePosition() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual jboolean isActive() = 0;
-  virtual jboolean isRunning() = 0;
-  virtual void start() = 0;
-  virtual void stop() = 0;
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_TargetDataLine__
diff --git a/libjava/javax/sound/sampled/UnsupportedAudioFileException.h b/libjava/javax/sound/sampled/UnsupportedAudioFileException.h
deleted file mode 100644
index 896c85a4226..00000000000
--- a/libjava/javax/sound/sampled/UnsupportedAudioFileException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_UnsupportedAudioFileException__
-#define __javax_sound_sampled_UnsupportedAudioFileException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class UnsupportedAudioFileException;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::UnsupportedAudioFileException : public ::java::lang::Exception
-{
-
-public:
-  UnsupportedAudioFileException();
-  UnsupportedAudioFileException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -139127412623160368LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_UnsupportedAudioFileException__
diff --git a/libjava/javax/sound/sampled/spi/AudioFileReader.h b/libjava/javax/sound/sampled/spi/AudioFileReader.h
deleted file mode 100644
index aab7d7d6887..00000000000
--- a/libjava/javax/sound/sampled/spi/AudioFileReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_spi_AudioFileReader__
-#define __javax_sound_sampled_spi_AudioFileReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioInputStream;
-        namespace spi
-        {
-            class AudioFileReader;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::spi::AudioFileReader : public ::java::lang::Object
-{
-
-public:
-  AudioFileReader();
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *) = 0;
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *) = 0;
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *) = 0;
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::net::URL *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_spi_AudioFileReader__
diff --git a/libjava/javax/sound/sampled/spi/AudioFileWriter.h b/libjava/javax/sound/sampled/spi/AudioFileWriter.h
deleted file mode 100644
index 558e3daeaf1..00000000000
--- a/libjava/javax/sound/sampled/spi/AudioFileWriter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_spi_AudioFileWriter__
-#define __javax_sound_sampled_spi_AudioFileWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat$Type;
-          class AudioInputStream;
-        namespace spi
-        {
-            class AudioFileWriter;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::spi::AudioFileWriter : public ::java::lang::Object
-{
-
-public:
-  AudioFileWriter();
-  virtual JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes() = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes(::javax::sound::sampled::AudioInputStream *) = 0;
-  virtual jboolean isFileTypeSupported(::javax::sound::sampled::AudioFileFormat$Type *);
-  virtual jboolean isFileTypeSupported(::javax::sound::sampled::AudioFileFormat$Type *, ::javax::sound::sampled::AudioInputStream *);
-  virtual jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::File *) = 0;
-  virtual jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::OutputStream *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_spi_AudioFileWriter__
diff --git a/libjava/javax/sound/sampled/spi/FormatConversionProvider.h b/libjava/javax/sound/sampled/spi/FormatConversionProvider.h
deleted file mode 100644
index e00ccac45e2..00000000000
--- a/libjava/javax/sound/sampled/spi/FormatConversionProvider.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_spi_FormatConversionProvider__
-#define __javax_sound_sampled_spi_FormatConversionProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioFormat$Encoding;
-          class AudioInputStream;
-        namespace spi
-        {
-            class FormatConversionProvider;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::spi::FormatConversionProvider : public ::java::lang::Object
-{
-
-public:
-  FormatConversionProvider();
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioInputStream *) = 0;
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::AudioInputStream *) = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getSourceEncodings() = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getTargetEncodings() = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getTargetEncodings(::javax::sound::sampled::AudioFormat *) = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFormat * > * getTargetFormats(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioFormat *) = 0;
-  virtual jboolean isConversionSupported(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioFormat *);
-  virtual jboolean isConversionSupported(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::AudioFormat *);
-  virtual jboolean isSourceEncodingSupported(::javax::sound::sampled::AudioFormat$Encoding *);
-  virtual jboolean isTargetEncodingSupported(::javax::sound::sampled::AudioFormat$Encoding *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_spi_FormatConversionProvider__
diff --git a/libjava/javax/sound/sampled/spi/MixerProvider.h b/libjava/javax/sound/sampled/spi/MixerProvider.h
deleted file mode 100644
index 50fc476d0ba..00000000000
--- a/libjava/javax/sound/sampled/spi/MixerProvider.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_spi_MixerProvider__
-#define __javax_sound_sampled_spi_MixerProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Mixer;
-          class Mixer$Info;
-        namespace spi
-        {
-            class MixerProvider;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::spi::MixerProvider : public ::java::lang::Object
-{
-
-public:
-  MixerProvider();
-  virtual ::javax::sound::sampled::Mixer * getMixer(::javax::sound::sampled::Mixer$Info *) = 0;
-  virtual JArray< ::javax::sound::sampled::Mixer$Info * > * getMixerInfo() = 0;
-  virtual jboolean isMixerSupported(::javax::sound::sampled::Mixer$Info *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_spi_MixerProvider__
diff --git a/libjava/javax/sql/ConnectionEvent.h b/libjava/javax/sql/ConnectionEvent.h
deleted file mode 100644
index 19f1de27b66..00000000000
--- a/libjava/javax/sql/ConnectionEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_ConnectionEvent__
-#define __javax_sql_ConnectionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLException;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionEvent;
-        class PooledConnection;
-    }
-  }
-}
-
-class javax::sql::ConnectionEvent : public ::java::util::EventObject
-{
-
-public:
-  ConnectionEvent(::javax::sql::PooledConnection *);
-  ConnectionEvent(::javax::sql::PooledConnection *, ::java::sql::SQLException *);
-  virtual ::java::sql::SQLException * getSQLException();
-private:
-  static const jlong serialVersionUID = -4843217645290030002LL;
-  ::java::sql::SQLException * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) ex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sql_ConnectionEvent__
diff --git a/libjava/javax/sql/ConnectionEventListener.h b/libjava/javax/sql/ConnectionEventListener.h
deleted file mode 100644
index c412cb76642..00000000000
--- a/libjava/javax/sql/ConnectionEventListener.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_ConnectionEventListener__
-#define __javax_sql_ConnectionEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionEvent;
-        class ConnectionEventListener;
-    }
-  }
-}
-
-class javax::sql::ConnectionEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void connectionClosed(::javax::sql::ConnectionEvent *) = 0;
-  virtual void connectionErrorOccurred(::javax::sql::ConnectionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_ConnectionEventListener__
diff --git a/libjava/javax/sql/ConnectionPoolDataSource.h b/libjava/javax/sql/ConnectionPoolDataSource.h
deleted file mode 100644
index c64160e77c7..00000000000
--- a/libjava/javax/sql/ConnectionPoolDataSource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_ConnectionPoolDataSource__
-#define __javax_sql_ConnectionPoolDataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionPoolDataSource;
-        class PooledConnection;
-    }
-  }
-}
-
-class javax::sql::ConnectionPoolDataSource : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::sql::PooledConnection * getPooledConnection() = 0;
-  virtual ::javax::sql::PooledConnection * getPooledConnection(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::io::PrintWriter * getLogWriter() = 0;
-  virtual void setLogWriter(::java::io::PrintWriter *) = 0;
-  virtual void setLoginTimeout(jint) = 0;
-  virtual jint getLoginTimeout() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_ConnectionPoolDataSource__
diff --git a/libjava/javax/sql/DataSource.h b/libjava/javax/sql/DataSource.h
deleted file mode 100644
index f8048bd3183..00000000000
--- a/libjava/javax/sql/DataSource.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_DataSource__
-#define __javax_sql_DataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class DataSource;
-    }
-  }
-}
-
-class javax::sql::DataSource : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual ::java::sql::Connection * getConnection(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::io::PrintWriter * getLogWriter() = 0;
-  virtual void setLogWriter(::java::io::PrintWriter *) = 0;
-  virtual void setLoginTimeout(jint) = 0;
-  virtual jint getLoginTimeout() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_DataSource__
diff --git a/libjava/javax/sql/PooledConnection.h b/libjava/javax/sql/PooledConnection.h
deleted file mode 100644
index 9310e91ea9c..00000000000
--- a/libjava/javax/sql/PooledConnection.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_PooledConnection__
-#define __javax_sql_PooledConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionEventListener;
-        class PooledConnection;
-    }
-  }
-}
-
-class javax::sql::PooledConnection : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual void close() = 0;
-  virtual void addConnectionEventListener(::javax::sql::ConnectionEventListener *) = 0;
-  virtual void removeConnectionEventListener(::javax::sql::ConnectionEventListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_PooledConnection__
diff --git a/libjava/javax/sql/RowSet.h b/libjava/javax/sql/RowSet.h
deleted file mode 100644
index b55f16589b3..00000000000
--- a/libjava/javax/sql/RowSet.h
+++ /dev/null
@@ -1,252 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSet__
-#define __javax_sql_RowSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Date;
-        class Ref;
-        class ResultSetMetaData;
-        class SQLWarning;
-        class Statement;
-        class Time;
-        class Timestamp;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSet;
-        class RowSetListener;
-    }
-  }
-}
-
-class javax::sql::RowSet : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getUrl() = 0;
-  virtual void setUrl(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDataSourceName() = 0;
-  virtual void setDataSourceName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getUsername() = 0;
-  virtual void setUsername(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPassword() = 0;
-  virtual void setPassword(::java::lang::String *) = 0;
-  virtual jint getTransactionIsolation() = 0;
-  virtual void setTransactionIsolation(jint) = 0;
-  virtual ::java::util::Map * getTypeMap() = 0;
-  virtual void setTypeMap(::java::util::Map *) = 0;
-  virtual ::java::lang::String * getCommand() = 0;
-  virtual void setCommand(::java::lang::String *) = 0;
-  virtual jboolean isReadOnly() = 0;
-  virtual void setReadOnly(jboolean) = 0;
-  virtual jint getMaxFieldSize() = 0;
-  virtual void setMaxFieldSize(jint) = 0;
-  virtual jint getMaxRows() = 0;
-  virtual void setMaxRows(jint) = 0;
-  virtual jboolean getEscapeProcessing() = 0;
-  virtual void setEscapeProcessing(jboolean) = 0;
-  virtual jint getQueryTimeout() = 0;
-  virtual void setQueryTimeout(jint) = 0;
-  virtual void setType(jint) = 0;
-  virtual void setConcurrency(jint) = 0;
-  virtual void setNull(jint, jint) = 0;
-  virtual void setNull(jint, jint, ::java::lang::String *) = 0;
-  virtual void setBoolean(jint, jboolean) = 0;
-  virtual void setByte(jint, jbyte) = 0;
-  virtual void setShort(jint, jshort) = 0;
-  virtual void setInt(jint, jint) = 0;
-  virtual void setLong(jint, jlong) = 0;
-  virtual void setFloat(jint, jfloat) = 0;
-  virtual void setDouble(jint, jdouble) = 0;
-  virtual void setBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void setString(jint, ::java::lang::String *) = 0;
-  virtual void setBytes(jint, JArray< jbyte > *) = 0;
-  virtual void setDate(jint, ::java::sql::Date *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void setAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *) = 0;
-  virtual void setRef(jint, ::java::sql::Ref *) = 0;
-  virtual void setBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void setClob(jint, ::java::sql::Clob *) = 0;
-  virtual void setArray(jint, ::java::sql::Array *) = 0;
-  virtual void setDate(jint, ::java::sql::Date *, ::java::util::Calendar *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *, ::java::util::Calendar *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *, ::java::util::Calendar *) = 0;
-  virtual void clearParameters() = 0;
-  virtual void execute() = 0;
-  virtual void addRowSetListener(::javax::sql::RowSetListener *) = 0;
-  virtual void removeRowSetListener(::javax::sql::RowSetListener *) = 0;
-  virtual jboolean next() = 0;
-  virtual void close() = 0;
-  virtual jboolean wasNull() = 0;
-  virtual ::java::lang::String * getString(jint) = 0;
-  virtual jboolean getBoolean(jint) = 0;
-  virtual jbyte getByte(jint) = 0;
-  virtual jshort getShort(jint) = 0;
-  virtual jint getInt(jint) = 0;
-  virtual jlong getLong(jint) = 0;
-  virtual jfloat getFloat(jint) = 0;
-  virtual jdouble getDouble(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint, jint) = 0;
-  virtual JArray< jbyte > * getBytes(jint) = 0;
-  virtual ::java::sql::Date * getDate(jint) = 0;
-  virtual ::java::sql::Time * getTime(jint) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint) = 0;
-  virtual ::java::io::InputStream * getAsciiStream(jint) = 0;
-  virtual ::java::io::InputStream * getUnicodeStream(jint) = 0;
-  virtual ::java::io::InputStream * getBinaryStream(jint) = 0;
-  virtual ::java::lang::String * getString(::java::lang::String *) = 0;
-  virtual jboolean getBoolean(::java::lang::String *) = 0;
-  virtual jbyte getByte(::java::lang::String *) = 0;
-  virtual jshort getShort(::java::lang::String *) = 0;
-  virtual jint getInt(::java::lang::String *) = 0;
-  virtual jlong getLong(::java::lang::String *) = 0;
-  virtual jfloat getFloat(::java::lang::String *) = 0;
-  virtual jdouble getDouble(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *, jint) = 0;
-  virtual JArray< jbyte > * getBytes(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getAsciiStream(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getUnicodeStream(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getBinaryStream(::java::lang::String *) = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual ::java::lang::String * getCursorName() = 0;
-  virtual ::java::sql::ResultSetMetaData * getMetaData() = 0;
-  virtual ::java::lang::Object * getObject(jint) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *) = 0;
-  virtual jint findColumn(::java::lang::String *) = 0;
-  virtual ::java::io::Reader * getCharacterStream(jint) = 0;
-  virtual ::java::io::Reader * getCharacterStream(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *) = 0;
-  virtual jboolean isBeforeFirst() = 0;
-  virtual jboolean isAfterLast() = 0;
-  virtual jboolean isFirst() = 0;
-  virtual jboolean isLast() = 0;
-  virtual void beforeFirst() = 0;
-  virtual void afterLast() = 0;
-  virtual jboolean first() = 0;
-  virtual jboolean last() = 0;
-  virtual jint getRow() = 0;
-  virtual jboolean absolute(jint) = 0;
-  virtual jboolean relative(jint) = 0;
-  virtual jboolean previous() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getType() = 0;
-  virtual jint getConcurrency() = 0;
-  virtual jboolean rowUpdated() = 0;
-  virtual jboolean rowInserted() = 0;
-  virtual jboolean rowDeleted() = 0;
-  virtual void updateNull(jint) = 0;
-  virtual void updateBoolean(jint, jboolean) = 0;
-  virtual void updateByte(jint, jbyte) = 0;
-  virtual void updateShort(jint, jshort) = 0;
-  virtual void updateInt(jint, jint) = 0;
-  virtual void updateLong(jint, jlong) = 0;
-  virtual void updateFloat(jint, jfloat) = 0;
-  virtual void updateDouble(jint, jdouble) = 0;
-  virtual void updateBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void updateString(jint, ::java::lang::String *) = 0;
-  virtual void updateBytes(jint, JArray< jbyte > *) = 0;
-  virtual void updateDate(jint, ::java::sql::Date *) = 0;
-  virtual void updateTime(jint, ::java::sql::Time *) = 0;
-  virtual void updateTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void updateAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void updateBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void updateCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void updateObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void updateObject(jint, ::java::lang::Object *) = 0;
-  virtual void updateNull(::java::lang::String *) = 0;
-  virtual void updateBoolean(::java::lang::String *, jboolean) = 0;
-  virtual void updateByte(::java::lang::String *, jbyte) = 0;
-  virtual void updateShort(::java::lang::String *, jshort) = 0;
-  virtual void updateInt(::java::lang::String *, jint) = 0;
-  virtual void updateLong(::java::lang::String *, jlong) = 0;
-  virtual void updateFloat(::java::lang::String *, jfloat) = 0;
-  virtual void updateDouble(::java::lang::String *, jdouble) = 0;
-  virtual void updateBigDecimal(::java::lang::String *, ::java::math::BigDecimal *) = 0;
-  virtual void updateString(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void updateBytes(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual void updateDate(::java::lang::String *, ::java::sql::Date *) = 0;
-  virtual void updateTime(::java::lang::String *, ::java::sql::Time *) = 0;
-  virtual void updateTimestamp(::java::lang::String *, ::java::sql::Timestamp *) = 0;
-  virtual void updateAsciiStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void updateBinaryStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void updateCharacterStream(::java::lang::String *, ::java::io::Reader *, jint) = 0;
-  virtual void updateObject(::java::lang::String *, ::java::lang::Object *, jint) = 0;
-  virtual void updateObject(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void insertRow() = 0;
-  virtual void updateRow() = 0;
-  virtual void deleteRow() = 0;
-  virtual void refreshRow() = 0;
-  virtual void cancelRowUpdates() = 0;
-  virtual void moveToInsertRow() = 0;
-  virtual void moveToCurrentRow() = 0;
-  virtual ::java::sql::Statement * getStatement() = 0;
-  virtual ::java::lang::Object * getObject(jint, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(jint) = 0;
-  virtual ::java::sql::Blob * getBlob(jint) = 0;
-  virtual ::java::sql::Clob * getClob(jint) = 0;
-  virtual ::java::sql::Array * getArray(jint) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(::java::lang::String *) = 0;
-  virtual ::java::sql::Blob * getBlob(::java::lang::String *) = 0;
-  virtual ::java::sql::Clob * getClob(::java::lang::String *) = 0;
-  virtual ::java::sql::Array * getArray(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::net::URL * getURL(jint) = 0;
-  virtual ::java::net::URL * getURL(::java::lang::String *) = 0;
-  virtual void updateRef(jint, ::java::sql::Ref *) = 0;
-  virtual void updateRef(::java::lang::String *, ::java::sql::Ref *) = 0;
-  virtual void updateBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void updateBlob(::java::lang::String *, ::java::sql::Blob *) = 0;
-  virtual void updateClob(jint, ::java::sql::Clob *) = 0;
-  virtual void updateClob(::java::lang::String *, ::java::sql::Clob *) = 0;
-  virtual void updateArray(jint, ::java::sql::Array *) = 0;
-  virtual void updateArray(::java::lang::String *, ::java::sql::Array *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSet__
diff --git a/libjava/javax/sql/RowSetEvent.h b/libjava/javax/sql/RowSetEvent.h
deleted file mode 100644
index 5c5ba6e6461..00000000000
--- a/libjava/javax/sql/RowSetEvent.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetEvent__
-#define __javax_sql_RowSetEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSet;
-        class RowSetEvent;
-    }
-  }
-}
-
-class javax::sql::RowSetEvent : public ::java::util::EventObject
-{
-
-public:
-  RowSetEvent(::javax::sql::RowSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sql_RowSetEvent__
diff --git a/libjava/javax/sql/RowSetInternal.h b/libjava/javax/sql/RowSetInternal.h
deleted file mode 100644
index e1869df86f1..00000000000
--- a/libjava/javax/sql/RowSetInternal.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetInternal__
-#define __javax_sql_RowSetInternal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class ResultSet;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetInternal;
-        class RowSetMetaData;
-    }
-  }
-}
-
-class javax::sql::RowSetInternal : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Object * > * getParams() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual void setMetaData(::javax::sql::RowSetMetaData *) = 0;
-  virtual ::java::sql::ResultSet * getOriginal() = 0;
-  virtual ::java::sql::ResultSet * getOriginalRow() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetInternal__
diff --git a/libjava/javax/sql/RowSetListener.h b/libjava/javax/sql/RowSetListener.h
deleted file mode 100644
index 9edc7d4bcd0..00000000000
--- a/libjava/javax/sql/RowSetListener.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetListener__
-#define __javax_sql_RowSetListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetEvent;
-        class RowSetListener;
-    }
-  }
-}
-
-class javax::sql::RowSetListener : public ::java::lang::Object
-{
-
-public:
-  virtual void rowSetChanged(::javax::sql::RowSetEvent *) = 0;
-  virtual void rowChanged(::javax::sql::RowSetEvent *) = 0;
-  virtual void cursorMoved(::javax::sql::RowSetEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetListener__
diff --git a/libjava/javax/sql/RowSetMetaData.h b/libjava/javax/sql/RowSetMetaData.h
deleted file mode 100644
index 90d5a46c737..00000000000
--- a/libjava/javax/sql/RowSetMetaData.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetMetaData__
-#define __javax_sql_RowSetMetaData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetMetaData;
-    }
-  }
-}
-
-class javax::sql::RowSetMetaData : public ::java::lang::Object
-{
-
-public:
-  virtual void setColumnCount(jint) = 0;
-  virtual void setAutoIncrement(jint, jboolean) = 0;
-  virtual void setCaseSensitive(jint, jboolean) = 0;
-  virtual void setSearchable(jint, jboolean) = 0;
-  virtual void setCurrency(jint, jboolean) = 0;
-  virtual void setNullable(jint, jint) = 0;
-  virtual void setSigned(jint, jboolean) = 0;
-  virtual void setColumnDisplaySize(jint, jint) = 0;
-  virtual void setColumnLabel(jint, ::java::lang::String *) = 0;
-  virtual void setColumnName(jint, ::java::lang::String *) = 0;
-  virtual void setSchemaName(jint, ::java::lang::String *) = 0;
-  virtual void setPrecision(jint, jint) = 0;
-  virtual void setScale(jint, jint) = 0;
-  virtual void setTableName(jint, ::java::lang::String *) = 0;
-  virtual void setCatalogName(jint, ::java::lang::String *) = 0;
-  virtual void setColumnType(jint, jint) = 0;
-  virtual void setColumnTypeName(jint, ::java::lang::String *) = 0;
-  virtual jint getColumnCount() = 0;
-  virtual jboolean isAutoIncrement(jint) = 0;
-  virtual jboolean isCaseSensitive(jint) = 0;
-  virtual jboolean isSearchable(jint) = 0;
-  virtual jboolean isCurrency(jint) = 0;
-  virtual jint isNullable(jint) = 0;
-  virtual jboolean isSigned(jint) = 0;
-  virtual jint getColumnDisplaySize(jint) = 0;
-  virtual ::java::lang::String * getColumnLabel(jint) = 0;
-  virtual ::java::lang::String * getColumnName(jint) = 0;
-  virtual ::java::lang::String * getSchemaName(jint) = 0;
-  virtual jint getPrecision(jint) = 0;
-  virtual jint getScale(jint) = 0;
-  virtual ::java::lang::String * getTableName(jint) = 0;
-  virtual ::java::lang::String * getCatalogName(jint) = 0;
-  virtual jint getColumnType(jint) = 0;
-  virtual ::java::lang::String * getColumnTypeName(jint) = 0;
-  virtual jboolean isReadOnly(jint) = 0;
-  virtual jboolean isWritable(jint) = 0;
-  virtual jboolean isDefinitelyWritable(jint) = 0;
-  virtual ::java::lang::String * getColumnClassName(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetMetaData__
diff --git a/libjava/javax/sql/RowSetReader.h b/libjava/javax/sql/RowSetReader.h
deleted file mode 100644
index 6e2adad48f3..00000000000
--- a/libjava/javax/sql/RowSetReader.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetReader__
-#define __javax_sql_RowSetReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetInternal;
-        class RowSetReader;
-    }
-  }
-}
-
-class javax::sql::RowSetReader : public ::java::lang::Object
-{
-
-public:
-  virtual void readData(::javax::sql::RowSetInternal *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetReader__
diff --git a/libjava/javax/sql/RowSetWriter.h b/libjava/javax/sql/RowSetWriter.h
deleted file mode 100644
index c4ce0de158c..00000000000
--- a/libjava/javax/sql/RowSetWriter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetWriter__
-#define __javax_sql_RowSetWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetInternal;
-        class RowSetWriter;
-    }
-  }
-}
-
-class javax::sql::RowSetWriter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean writeData(::javax::sql::RowSetInternal *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetWriter__
diff --git a/libjava/javax/sql/XAConnection.h b/libjava/javax/sql/XAConnection.h
deleted file mode 100644
index ece83a7c9ce..00000000000
--- a/libjava/javax/sql/XAConnection.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_XAConnection__
-#define __javax_sql_XAConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionEventListener;
-        class XAConnection;
-    }
-    namespace transaction
-    {
-      namespace xa
-      {
-          class XAResource;
-      }
-    }
-  }
-}
-
-class javax::sql::XAConnection : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::transaction::xa::XAResource * getXAResource() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual void close() = 0;
-  virtual void addConnectionEventListener(::javax::sql::ConnectionEventListener *) = 0;
-  virtual void removeConnectionEventListener(::javax::sql::ConnectionEventListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_XAConnection__
diff --git a/libjava/javax/sql/XADataSource.h b/libjava/javax/sql/XADataSource.h
deleted file mode 100644
index b5177ad1983..00000000000
--- a/libjava/javax/sql/XADataSource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_XADataSource__
-#define __javax_sql_XADataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class XAConnection;
-        class XADataSource;
-    }
-  }
-}
-
-class javax::sql::XADataSource : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::sql::XAConnection * getXAConnection() = 0;
-  virtual ::javax::sql::XAConnection * getXAConnection(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::io::PrintWriter * getLogWriter() = 0;
-  virtual void setLogWriter(::java::io::PrintWriter *) = 0;
-  virtual void setLoginTimeout(jint) = 0;
-  virtual jint getLoginTimeout() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_XADataSource__
diff --git a/libjava/javax/swing/AbstractAction.h b/libjava/javax/swing/AbstractAction.h
deleted file mode 100644
index 6f79d0d37f1..00000000000
--- a/libjava/javax/swing/AbstractAction.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractAction__
-#define __javax_swing_AbstractAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractAction;
-        class Icon;
-      namespace event
-      {
-          class SwingPropertyChangeSupport;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractAction : public ::java::lang::Object
-{
-
-public:
-  AbstractAction();
-  AbstractAction(::java::lang::String *);
-  AbstractAction(::java::lang::String *, ::javax::swing::Icon *);
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  virtual ::java::lang::Object * getValue(::java::lang::String *);
-  virtual void putValue(::java::lang::String *, ::java::lang::Object *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual JArray< ::java::lang::Object * > * getKeys();
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-public:
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *) = 0;
-private:
-  static const jlong serialVersionUID = -6803159439231523484LL;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabled;
-  ::javax::swing::event::SwingPropertyChangeSupport * changeSupport;
-private:
-  ::java::util::HashMap * store;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractAction__
diff --git a/libjava/javax/swing/AbstractButton$1.h b/libjava/javax/swing/AbstractButton$1.h
deleted file mode 100644
index e64e2c91113..00000000000
--- a/libjava/javax/swing/AbstractButton$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$1__
-#define __javax_swing_AbstractButton$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$1;
-    }
-  }
-}
-
-class javax::swing::AbstractButton$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractButton$1(::javax::swing::AbstractButton *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$1__
diff --git a/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h b/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h
deleted file mode 100644
index fd5ea169d2d..00000000000
--- a/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$AccessibleAbstractButton__
-#define __javax_swing_AbstractButton$AccessibleAbstractButton__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleIcon;
-        class AccessibleRelationSet;
-        class AccessibleStateSet;
-        class AccessibleText;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$AccessibleAbstractButton;
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractButton$AccessibleAbstractButton : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  AbstractButton$AccessibleAbstractButton(::javax::swing::AbstractButton *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual JArray< ::javax::accessibility::AccessibleIcon * > * getAccessibleIcon();
-  virtual ::javax::accessibility::AccessibleRelationSet * getAccessibleRelationSet();
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getCharCount();
-  virtual jint getCaretPosition();
-  virtual ::java::lang::String * getAtIndex(jint, jint);
-  virtual ::java::lang::String * getAfterIndex(jint, jint);
-  virtual ::java::lang::String * getBeforeIndex(jint, jint);
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::java::lang::String * getSelectedText();
-private:
-  static const jlong serialVersionUID = -5673062525319836790LL;
-public: // actually package-private
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$AccessibleAbstractButton__
diff --git a/libjava/javax/swing/AbstractButton$ButtonChangeListener.h b/libjava/javax/swing/AbstractButton$ButtonChangeListener.h
deleted file mode 100644
index e291daa77aa..00000000000
--- a/libjava/javax/swing/AbstractButton$ButtonChangeListener.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$ButtonChangeListener__
-#define __javax_swing_AbstractButton$ButtonChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$ButtonChangeListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractButton$ButtonChangeListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractButton$ButtonChangeListener(::javax::swing::AbstractButton *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-private:
-  static const jlong serialVersionUID = 1471056094226600578LL;
-public: // actually package-private
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$ButtonChangeListener__
diff --git a/libjava/javax/swing/AbstractButton$EventHandler.h b/libjava/javax/swing/AbstractButton$EventHandler.h
deleted file mode 100644
index 148efd61172..00000000000
--- a/libjava/javax/swing/AbstractButton$EventHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$EventHandler__
-#define __javax_swing_AbstractButton$EventHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$EventHandler;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractButton$EventHandler : public ::java::lang::Object
-{
-
-  AbstractButton$EventHandler(::javax::swing::AbstractButton *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  AbstractButton$EventHandler(::javax::swing::AbstractButton *, ::javax::swing::AbstractButton$EventHandler *);
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$EventHandler__
diff --git a/libjava/javax/swing/AbstractButton.h b/libjava/javax/swing/AbstractButton.h
deleted file mode 100644
index 82cf58823fd..00000000000
--- a/libjava/javax/swing/AbstractButton.h
+++ /dev/null
@@ -1,227 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton__
-#define __javax_swing_AbstractButton__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Image;
-        class Insets;
-        class LayoutManager;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$EventHandler;
-        class Action;
-        class ButtonModel;
-        class Icon;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ButtonUI;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractButton : public ::javax::swing::JComponent
-{
-
-public:
-  AbstractButton();
-  virtual ::javax::swing::ButtonModel * getModel();
-  virtual void setModel(::javax::swing::ButtonModel *);
-public: // actually protected
-  virtual void init(::java::lang::String *, ::javax::swing::Icon *);
-public:
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setActionCommand(::java::lang::String *);
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
-  virtual void fireStateChanged();
-public:
-  virtual jint getMnemonic();
-  virtual void setMnemonic(jchar);
-  virtual void setMnemonic(jint);
-  virtual void setDisplayedMnemonicIndex(jint);
-  virtual jint getDisplayedMnemonicIndex();
-  virtual void setRolloverEnabled(jboolean);
-  virtual jboolean isRolloverEnabled();
-  virtual void setSelected(jboolean);
-  virtual jboolean isSelected();
-  virtual void setEnabled(jboolean);
-  virtual jint getHorizontalAlignment();
-  virtual void setHorizontalAlignment(jint);
-  virtual jint getHorizontalTextPosition();
-  virtual void setHorizontalTextPosition(jint);
-  virtual jint getVerticalAlignment();
-  virtual void setVerticalAlignment(jint);
-  virtual jint getVerticalTextPosition();
-  virtual void setVerticalTextPosition(jint);
-  virtual jboolean isBorderPainted();
-  virtual void setBorderPainted(jboolean);
-  virtual ::javax::swing::Action * getAction();
-  virtual void setAction(::javax::swing::Action *);
-  virtual ::javax::swing::Icon * getIcon();
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual ::java::lang::String * getText();
-  virtual void setLabel(::java::lang::String *);
-  virtual ::java::lang::String * getLabel();
-  virtual void setText(::java::lang::String *);
-  virtual void setIconTextGap(jint);
-  virtual jint getIconTextGap();
-  virtual ::java::awt::Insets * getMargin();
-  virtual void setMargin(::java::awt::Insets *);
-  virtual ::javax::swing::Icon * getPressedIcon();
-  virtual void setPressedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getDisabledIcon();
-  virtual void setDisabledIcon(::javax::swing::Icon *);
-  virtual jboolean isFocusPainted();
-  virtual void setFocusPainted(jboolean);
-public: // actually protected
-  virtual jint checkHorizontalKey(jint, ::java::lang::String *);
-  virtual jint checkVerticalKey(jint, ::java::lang::String *);
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-  virtual ::java::awt::event::ActionListener * createActionListener();
-  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-  virtual ::java::awt::event::ItemListener * createItemListener();
-public:
-  virtual void doClick();
-  virtual void doClick(jint);
-  virtual ::javax::swing::Icon * getDisabledSelectedIcon();
-  virtual void setDisabledSelectedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getRolloverIcon();
-  virtual void setRolloverIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getRolloverSelectedIcon();
-  virtual void setRolloverSelectedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getSelectedIcon();
-  virtual void setSelectedIcon(::javax::swing::Icon *);
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-  virtual jboolean isContentAreaFilled();
-  virtual void setContentAreaFilled(jboolean);
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void setUI(::javax::swing::plaf::ButtonUI *);
-  virtual ::javax::swing::plaf::ButtonUI * getUI();
-  virtual void updateUI();
-  virtual jlong getMultiClickThreshhold();
-  virtual void setMultiClickThreshhold(jlong);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void setLayout(::java::awt::LayoutManager *);
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::javax::swing::AbstractButton$EventHandler * getEventHandler();
-private:
-  static const jlong serialVersionUID = -937921345538462020LL;
-public: // actually package-private
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) default_icon;
-  ::javax::swing::Icon * pressed_icon;
-  ::javax::swing::Icon * disabledIcon;
-  ::javax::swing::Icon * selectedIcon;
-  ::javax::swing::Icon * disabledSelectedIcon;
-  ::javax::swing::Icon * rolloverIcon;
-  ::javax::swing::Icon * rolloverSelectedIcon;
-  ::javax::swing::Icon * current_icon;
-  ::java::lang::String * text;
-  jint iconTextGap;
-  jint verticalAlignment;
-  jint horizontalAlignment;
-  jint horizontalTextPosition;
-  jint verticalTextPosition;
-  jboolean borderPainted;
-  jboolean focusPainted;
-  jboolean contentAreaFilled;
-  jboolean rollOverEnabled;
-  ::javax::swing::Action * action;
-public: // actually protected
-  ::javax::swing::ButtonModel * model;
-public: // actually package-private
-  ::java::awt::Insets * margin;
-  jint mnemonicIndex;
-public: // actually protected
-  ::java::awt::event::ActionListener * actionListener;
-  ::java::awt::event::ItemListener * itemListener;
-  ::javax::swing::event::ChangeListener * changeListener;
-private:
-  ::javax::swing::AbstractButton$EventHandler * eventHandler;
-public: // actually package-private
-  jlong multiClickThreshhold;
-  ::java::beans::PropertyChangeListener * actionPropertyChangeListener;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * changeEvent;
-private:
-  jboolean clientBorderPaintedSet;
-  jboolean clientRolloverEnabledSet;
-  jboolean clientIconTextGapSet;
-  jboolean clientContentAreaFilledSet;
-public:
-  static ::java::lang::String * BORDER_PAINTED_CHANGED_PROPERTY;
-  static ::java::lang::String * CONTENT_AREA_FILLED_CHANGED_PROPERTY;
-  static ::java::lang::String * DISABLED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * DISABLED_SELECTED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * FOCUS_PAINTED_CHANGED_PROPERTY;
-  static ::java::lang::String * HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY;
-  static ::java::lang::String * HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY;
-  static ::java::lang::String * ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * MARGIN_CHANGED_PROPERTY;
-  static ::java::lang::String * MNEMONIC_CHANGED_PROPERTY;
-  static ::java::lang::String * MODEL_CHANGED_PROPERTY;
-  static ::java::lang::String * PRESSED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * ROLLOVER_ENABLED_CHANGED_PROPERTY;
-  static ::java::lang::String * ROLLOVER_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * SELECTED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * TEXT_CHANGED_PROPERTY;
-  static ::java::lang::String * VERTICAL_ALIGNMENT_CHANGED_PROPERTY;
-  static ::java::lang::String * VERTICAL_TEXT_POSITION_CHANGED_PROPERTY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton__
diff --git a/libjava/javax/swing/AbstractCellEditor.h b/libjava/javax/swing/AbstractCellEditor.h
deleted file mode 100644
index a3aae0dbd58..00000000000
--- a/libjava/javax/swing/AbstractCellEditor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractCellEditor__
-#define __javax_swing_AbstractCellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractCellEditor;
-      namespace event
-      {
-          class CellEditorListener;
-          class ChangeEvent;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractCellEditor : public ::java::lang::Object
-{
-
-public:
-  AbstractCellEditor();
-  virtual jboolean isCellEditable(::java::util::EventObject *);
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-  virtual jboolean stopCellEditing();
-  virtual void cancelCellEditing();
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *);
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *);
-  virtual JArray< ::javax::swing::event::CellEditorListener * > * getCellEditorListeners();
-public: // actually protected
-  virtual void fireEditingStopped();
-  virtual void fireEditingCanceled();
-public:
-  virtual ::java::lang::Object * getCellEditorValue() = 0;
-private:
-  static const jlong serialVersionUID = -1048006551406220959LL;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractCellEditor__
diff --git a/libjava/javax/swing/AbstractListModel.h b/libjava/javax/swing/AbstractListModel.h
deleted file mode 100644
index 5e6eb547690..00000000000
--- a/libjava/javax/swing/AbstractListModel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractListModel__
-#define __javax_swing_AbstractListModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractListModel;
-      namespace event
-      {
-          class EventListenerList;
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractListModel : public ::java::lang::Object
-{
-
-public:
-  AbstractListModel();
-  virtual void addListDataListener(::javax::swing::event::ListDataListener *);
-  virtual void removeListDataListener(::javax::swing::event::ListDataListener *);
-public: // actually protected
-  virtual void fireContentsChanged(::java::lang::Object *, jint, jint);
-  virtual void fireIntervalAdded(::java::lang::Object *, jint, jint);
-  virtual void fireIntervalRemoved(::java::lang::Object *, jint, jint);
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ListDataListener * > * getListDataListeners();
-  virtual jint getSize() = 0;
-  virtual ::java::lang::Object * getElementAt(jint) = 0;
-private:
-  static const jlong serialVersionUID = -3285184064379168730LL;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractListModel__
diff --git a/libjava/javax/swing/AbstractSpinnerModel.h b/libjava/javax/swing/AbstractSpinnerModel.h
deleted file mode 100644
index dde4ac870ae..00000000000
--- a/libjava/javax/swing/AbstractSpinnerModel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractSpinnerModel__
-#define __javax_swing_AbstractSpinnerModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractSpinnerModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractSpinnerModel : public ::java::lang::Object
-{
-
-public:
-  AbstractSpinnerModel();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual void setValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getValue() = 0;
-  virtual ::java::lang::Object * getNextValue() = 0;
-  virtual ::java::lang::Object * getPreviousValue() = 0;
-private:
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractSpinnerModel__
diff --git a/libjava/javax/swing/Action.h b/libjava/javax/swing/Action.h
deleted file mode 100644
index b3a42f4f0b5..00000000000
--- a/libjava/javax/swing/Action.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Action__
-#define __javax_swing_Action__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-    }
-  }
-}
-
-class javax::swing::Action : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getValue(::java::lang::String *) = 0;
-  virtual void putValue(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual jboolean isEnabled() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void actionPerformed(::java::awt::event::ActionEvent *) = 0;
-  static ::java::lang::String * DEFAULT;
-  static ::java::lang::String * LONG_DESCRIPTION;
-  static ::java::lang::String * NAME;
-  static ::java::lang::String * SHORT_DESCRIPTION;
-  static ::java::lang::String * SMALL_ICON;
-  static ::java::lang::String * ACCELERATOR_KEY;
-  static ::java::lang::String * ACTION_COMMAND_KEY;
-  static ::java::lang::String * MNEMONIC_KEY;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_Action__
diff --git a/libjava/javax/swing/ActionMap.h b/libjava/javax/swing/ActionMap.h
deleted file mode 100644
index 92e8e039ae6..00000000000
--- a/libjava/javax/swing/ActionMap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ActionMap__
-#define __javax_swing_ActionMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class ActionMap;
-    }
-  }
-}
-
-class javax::swing::ActionMap : public ::java::lang::Object
-{
-
-public:
-  ActionMap();
-  virtual ::javax::swing::Action * get(::java::lang::Object *);
-  virtual void put(::java::lang::Object *, ::javax::swing::Action *);
-  virtual void remove(::java::lang::Object *);
-  virtual ::javax::swing::ActionMap * getParent();
-  virtual void setParent(::javax::swing::ActionMap *);
-  virtual jint size();
-  virtual void clear();
-  virtual JArray< ::java::lang::Object * > * keys();
-  virtual JArray< ::java::lang::Object * > * allKeys();
-private:
-  static const jlong serialVersionUID = -6277518704513986346LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) actionMap;
-  ::javax::swing::ActionMap * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ActionMap__
diff --git a/libjava/javax/swing/BorderFactory.h b/libjava/javax/swing/BorderFactory.h
deleted file mode 100644
index 2a84d3366c5..00000000000
--- a/libjava/javax/swing/BorderFactory.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_BorderFactory__
-#define __javax_swing_BorderFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class BorderFactory;
-        class Icon;
-      namespace border
-      {
-          class Border;
-          class CompoundBorder;
-          class MatteBorder;
-          class TitledBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::BorderFactory : public ::java::lang::Object
-{
-
-  BorderFactory();
-public:
-  static ::javax::swing::border::Border * createLineBorder(::java::awt::Color *);
-  static ::javax::swing::border::Border * createLineBorder(::java::awt::Color *, jint);
-  static ::javax::swing::border::Border * createRaisedBevelBorder();
-  static ::javax::swing::border::Border * createLoweredBevelBorder();
-  static ::javax::swing::border::Border * createBevelBorder(jint);
-  static ::javax::swing::border::Border * createBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  static ::javax::swing::border::Border * createBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  static ::javax::swing::border::Border * createEtchedBorder();
-  static ::javax::swing::border::Border * createEtchedBorder(jint);
-  static ::javax::swing::border::Border * createEtchedBorder(::java::awt::Color *, ::java::awt::Color *);
-  static ::javax::swing::border::Border * createEtchedBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::java::lang::String *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
-  static ::javax::swing::border::Border * createEmptyBorder();
-  static ::javax::swing::border::Border * createEmptyBorder(jint, jint, jint, jint);
-  static ::javax::swing::border::CompoundBorder * createCompoundBorder();
-  static ::javax::swing::border::CompoundBorder * createCompoundBorder(::javax::swing::border::Border *, ::javax::swing::border::Border *);
-  static ::javax::swing::border::MatteBorder * createMatteBorder(jint, jint, jint, jint, ::java::awt::Color *);
-  static ::javax::swing::border::MatteBorder * createMatteBorder(jint, jint, jint, jint, ::javax::swing::Icon *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_BorderFactory__
diff --git a/libjava/javax/swing/BoundedRangeModel.h b/libjava/javax/swing/BoundedRangeModel.h
deleted file mode 100644
index 6842157c266..00000000000
--- a/libjava/javax/swing/BoundedRangeModel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_BoundedRangeModel__
-#define __javax_swing_BoundedRangeModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class BoundedRangeModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::BoundedRangeModel : public ::java::lang::Object
-{
-
-public:
-  virtual jint getValue() = 0;
-  virtual void setValue(jint) = 0;
-  virtual jint getMinimum() = 0;
-  virtual void setMinimum(jint) = 0;
-  virtual jint getMaximum() = 0;
-  virtual void setMaximum(jint) = 0;
-  virtual jboolean getValueIsAdjusting() = 0;
-  virtual void setValueIsAdjusting(jboolean) = 0;
-  virtual jint getExtent() = 0;
-  virtual void setExtent(jint) = 0;
-  virtual void setRangeProperties(jint, jint, jint, jint, jboolean) = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_BoundedRangeModel__
diff --git a/libjava/javax/swing/Box$AccessibleBox.h b/libjava/javax/swing/Box$AccessibleBox.h
deleted file mode 100644
index eb552a1857d..00000000000
--- a/libjava/javax/swing/Box$AccessibleBox.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Box$AccessibleBox__
-#define __javax_swing_Box$AccessibleBox__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class Box;
-        class Box$AccessibleBox;
-    }
-  }
-}
-
-class javax::swing::Box$AccessibleBox : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  Box$AccessibleBox(::javax::swing::Box *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -7775079816389931944LL;
-public: // actually package-private
-  ::javax::swing::Box * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Box$AccessibleBox__
diff --git a/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h b/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h
deleted file mode 100644
index 66440c34421..00000000000
--- a/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Box$Filler$AccessibleBoxFiller__
-#define __javax_swing_Box$Filler$AccessibleBoxFiller__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class Box$Filler;
-        class Box$Filler$AccessibleBoxFiller;
-    }
-  }
-}
-
-class javax::swing::Box$Filler$AccessibleBoxFiller : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Box$Filler$AccessibleBoxFiller(::javax::swing::Box$Filler *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 164963348357479321LL;
-public: // actually package-private
-  ::javax::swing::Box$Filler * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Box$Filler$AccessibleBoxFiller__
diff --git a/libjava/javax/swing/Box$Filler.h b/libjava/javax/swing/Box$Filler.h
deleted file mode 100644
index a16dc81500e..00000000000
--- a/libjava/javax/swing/Box$Filler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Box$Filler__
-#define __javax_swing_Box$Filler__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Box$Filler;
-    }
-  }
-}
-
-class javax::swing::Box$Filler : public ::javax::swing::JComponent
-{
-
-public:
-  Box$Filler(::java::awt::Dimension *, ::java::awt::Dimension *, ::java::awt::Dimension *);
-  virtual void changeShape(::java::awt::Dimension *, ::java::awt::Dimension *, ::java::awt::Dimension *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-private:
-  static const jlong serialVersionUID = -1204263191910183998LL;
-  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) min;
-  ::java::awt::Dimension * pref;
-  ::java::awt::Dimension * max;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Box$Filler__
diff --git a/libjava/javax/swing/Box.h b/libjava/javax/swing/Box.h
deleted file mode 100644
index 29538a6eed8..00000000000
--- a/libjava/javax/swing/Box.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Box__
-#define __javax_swing_Box__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class LayoutManager;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Box;
-    }
-  }
-}
-
-class javax::swing::Box : public ::javax::swing::JComponent
-{
-
-public:
-  Box(jint);
-  static ::java::awt::Component * createGlue();
-  static ::javax::swing::Box * createHorizontalBox();
-  static ::java::awt::Component * createHorizontalGlue();
-  static ::java::awt::Component * createHorizontalStrut(jint);
-  static ::java::awt::Component * createRigidArea(::java::awt::Dimension *);
-  static ::javax::swing::Box * createVerticalBox();
-  static ::java::awt::Component * createVerticalGlue();
-  static ::java::awt::Component * createVerticalStrut(jint);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 1525417495883046342LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Box__
diff --git a/libjava/javax/swing/BoxLayout.h b/libjava/javax/swing/BoxLayout.h
deleted file mode 100644
index c60bb8dd9b9..00000000000
--- a/libjava/javax/swing/BoxLayout.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_BoxLayout__
-#define __javax_swing_BoxLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class BoxLayout;
-        class SizeRequirements;
-    }
-  }
-}
-
-class javax::swing::BoxLayout : public ::java::lang::Object
-{
-
-public:
-  BoxLayout(::java::awt::Container *, jint);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-private:
-  jboolean isHorizontalIn(::java::awt::Container *);
-public:
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-private:
-  void checkTotalRequirements();
-  void checkRequirements();
-  void checkLayout();
-public:
-  static const jint X_AXIS = 0;
-  static const jint Y_AXIS = 1;
-  static const jint LINE_AXIS = 2;
-  static const jint PAGE_AXIS = 3;
-private:
-  static const jlong serialVersionUID = -2474455742719112368LL;
-  ::java::awt::Container * __attribute__((aligned(__alignof__( ::java::lang::Object)))) container;
-  jint way;
-  JArray< ::javax::swing::SizeRequirements * > * xChildren;
-  JArray< ::javax::swing::SizeRequirements * > * yChildren;
-  ::javax::swing::SizeRequirements * xTotal;
-  ::javax::swing::SizeRequirements * yTotal;
-  JArray< jint > * offsetsX;
-  JArray< jint > * offsetsY;
-  JArray< jint > * spansX;
-  JArray< jint > * spansY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_BoxLayout__
diff --git a/libjava/javax/swing/ButtonGroup.h b/libjava/javax/swing/ButtonGroup.h
deleted file mode 100644
index 68f383ac653..00000000000
--- a/libjava/javax/swing/ButtonGroup.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ButtonGroup__
-#define __javax_swing_ButtonGroup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class ButtonGroup;
-        class ButtonModel;
-    }
-  }
-}
-
-class javax::swing::ButtonGroup : public ::java::lang::Object
-{
-
-public:
-  ButtonGroup();
-  virtual void add(::javax::swing::AbstractButton *);
-  virtual void remove(::javax::swing::AbstractButton *);
-  virtual ::java::util::Enumeration * getElements();
-  virtual ::javax::swing::ButtonModel * getSelection();
-public: // actually package-private
-  virtual ::javax::swing::AbstractButton * findButton(::javax::swing::ButtonModel *);
-public:
-  virtual void setSelected(::javax::swing::ButtonModel *, jboolean);
-  virtual jboolean isSelected(::javax::swing::ButtonModel *);
-  virtual jint getButtonCount();
-private:
-  static const jlong serialVersionUID = 4259076101881721375LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buttons;
-public: // actually package-private
-  ::javax::swing::ButtonModel * sel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ButtonGroup__
diff --git a/libjava/javax/swing/ButtonModel.h b/libjava/javax/swing/ButtonModel.h
deleted file mode 100644
index 5f137a654ba..00000000000
--- a/libjava/javax/swing/ButtonModel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ButtonModel__
-#define __javax_swing_ButtonModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionListener;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ButtonGroup;
-        class ButtonModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::ButtonModel : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isArmed() = 0;
-  virtual void setArmed(jboolean) = 0;
-  virtual jboolean isEnabled() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setPressed(jboolean) = 0;
-  virtual jboolean isPressed() = 0;
-  virtual void removeActionListener(::java::awt::event::ActionListener *) = 0;
-  virtual void addActionListener(::java::awt::event::ActionListener *) = 0;
-  virtual void addItemListener(::java::awt::event::ItemListener *) = 0;
-  virtual void removeItemListener(::java::awt::event::ItemListener *) = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void setRollover(jboolean) = 0;
-  virtual jboolean isRollover() = 0;
-  virtual jint getMnemonic() = 0;
-  virtual void setMnemonic(jint) = 0;
-  virtual void setActionCommand(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getActionCommand() = 0;
-  virtual void setGroup(::javax::swing::ButtonGroup *) = 0;
-  virtual void setSelected(jboolean) = 0;
-  virtual jboolean isSelected() = 0;
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ButtonModel__
diff --git a/libjava/javax/swing/CellEditor.h b/libjava/javax/swing/CellEditor.h
deleted file mode 100644
index 63e9c8b77f8..00000000000
--- a/libjava/javax/swing/CellEditor.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_CellEditor__
-#define __javax_swing_CellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class CellEditor;
-      namespace event
-      {
-          class CellEditorListener;
-      }
-    }
-  }
-}
-
-class javax::swing::CellEditor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getCellEditorValue() = 0;
-  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
-  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
-  virtual jboolean stopCellEditing() = 0;
-  virtual void cancelCellEditing() = 0;
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_CellEditor__
diff --git a/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h b/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h
deleted file mode 100644
index da0650bcb38..00000000000
--- a/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_CellRendererPane$AccessibleCellRendererPane__
-#define __javax_swing_CellRendererPane$AccessibleCellRendererPane__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class CellRendererPane;
-        class CellRendererPane$AccessibleCellRendererPane;
-    }
-  }
-}
-
-class javax::swing::CellRendererPane$AccessibleCellRendererPane : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  CellRendererPane$AccessibleCellRendererPane(::javax::swing::CellRendererPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -8981090083147391074LL;
-public: // actually package-private
-  ::javax::swing::CellRendererPane * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_CellRendererPane$AccessibleCellRendererPane__
diff --git a/libjava/javax/swing/CellRendererPane.h b/libjava/javax/swing/CellRendererPane.h
deleted file mode 100644
index af350004fed..00000000000
--- a/libjava/javax/swing/CellRendererPane.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_CellRendererPane__
-#define __javax_swing_CellRendererPane__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class CellRendererPane;
-    }
-  }
-}
-
-class javax::swing::CellRendererPane : public ::java::awt::Container
-{
-
-public:
-  CellRendererPane();
-  virtual void update(::java::awt::Graphics *);
-  virtual void invalidate();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint, jboolean);
-  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint);
-  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, ::java::awt::Rectangle *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -7642183829532984273LL;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Container)))) accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_CellRendererPane__
diff --git a/libjava/javax/swing/ComboBoxEditor.h b/libjava/javax/swing/ComboBoxEditor.h
deleted file mode 100644
index 14f0d457471..00000000000
--- a/libjava/javax/swing/ComboBoxEditor.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ComboBoxEditor__
-#define __javax_swing_ComboBoxEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxEditor;
-    }
-  }
-}
-
-class javax::swing::ComboBoxEditor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getEditorComponent() = 0;
-  virtual void setItem(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getItem() = 0;
-  virtual void selectAll() = 0;
-  virtual void addActionListener(::java::awt::event::ActionListener *) = 0;
-  virtual void removeActionListener(::java::awt::event::ActionListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ComboBoxEditor__
diff --git a/libjava/javax/swing/ComboBoxModel.h b/libjava/javax/swing/ComboBoxModel.h
deleted file mode 100644
index 0fd38ea13f2..00000000000
--- a/libjava/javax/swing/ComboBoxModel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ComboBoxModel__
-#define __javax_swing_ComboBoxModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxModel;
-      namespace event
-      {
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::ComboBoxModel : public ::java::lang::Object
-{
-
-public:
-  virtual void setSelectedItem(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getSelectedItem() = 0;
-  virtual jint getSize() = 0;
-  virtual ::java::lang::Object * getElementAt(jint) = 0;
-  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ComboBoxModel__
diff --git a/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h b/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h
deleted file mode 100644
index 46fcc805157..00000000000
--- a/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_CompatibilityFocusTraversalPolicy__
-#define __javax_swing_CompatibilityFocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/awt/FocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class FocusTraversalPolicy;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class CompatibilityFocusTraversalPolicy;
-    }
-  }
-}
-
-class javax::swing::CompatibilityFocusTraversalPolicy : public ::java::awt::FocusTraversalPolicy
-{
-
-public: // actually package-private
-  CompatibilityFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
-public:
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *);
-public: // actually package-private
-  virtual void setNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
-  virtual void addNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
-  virtual void removeNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
-private:
-  ::java::awt::FocusTraversalPolicy * __attribute__((aligned(__alignof__( ::java::awt::FocusTraversalPolicy)))) fallback;
-  ::java::util::HashMap * forward;
-  ::java::util::HashMap * backward;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_CompatibilityFocusTraversalPolicy__
diff --git a/libjava/javax/swing/ComponentInputMap.h b/libjava/javax/swing/ComponentInputMap.h
deleted file mode 100644
index e0ec4e94636..00000000000
--- a/libjava/javax/swing/ComponentInputMap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ComponentInputMap__
-#define __javax_swing_ComponentInputMap__
-
-#pragma interface
-
-#include <javax/swing/InputMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComponentInputMap;
-        class InputMap;
-        class JComponent;
-        class KeyStroke;
-    }
-  }
-}
-
-class javax::swing::ComponentInputMap : public ::javax::swing::InputMap
-{
-
-public:
-  ComponentInputMap(::javax::swing::JComponent *);
-  virtual void put(::javax::swing::KeyStroke *, ::java::lang::Object *);
-  virtual void clear();
-  virtual void remove(::javax::swing::KeyStroke *);
-  virtual void setParent(::javax::swing::InputMap *);
-  virtual ::javax::swing::JComponent * getComponent();
-private:
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::javax::swing::InputMap)))) component;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ComponentInputMap__
diff --git a/libjava/javax/swing/DebugGraphics.h b/libjava/javax/swing/DebugGraphics.h
deleted file mode 100644
index c21460f6d96..00000000000
--- a/libjava/javax/swing/DebugGraphics.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DebugGraphics__
-#define __javax_swing_DebugGraphics__
-
-#pragma interface
-
-#include <java/awt/Graphics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Image;
-        class Rectangle;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DebugGraphics;
-        class JComponent;
-    }
-  }
-}
-
-class javax::swing::DebugGraphics : public ::java::awt::Graphics
-{
-
-public:
-  DebugGraphics();
-  DebugGraphics(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  DebugGraphics(::java::awt::Graphics *);
-  virtual void setColor(::java::awt::Color *);
-  virtual ::java::awt::Graphics * create();
-  virtual ::java::awt::Graphics * create(jint, jint, jint, jint);
-  static ::java::awt::Color * flashColor();
-  static void setFlashColor(::java::awt::Color *);
-  static jint flashTime();
-  static void setFlashTime(jint);
-  static jint flashCount();
-  static void setFlashCount(jint);
-  static ::java::io::PrintStream * logStream();
-  static void setLogStream(::java::io::PrintStream *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Color * getColor();
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void translate(jint, jint);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  virtual ::java::awt::Rectangle * getClipBounds();
-  virtual void clipRect(jint, jint, jint, jint);
-  virtual void setClip(jint, jint, jint, jint);
-  virtual ::java::awt::Shape * getClip();
-  virtual void setClip(::java::awt::Shape *);
-private:
-  void sleep(jint);
-public:
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void fillRect(jint, jint, jint, jint);
-  virtual void clearRect(jint, jint, jint, jint);
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
-  virtual void drawLine(jint, jint, jint, jint);
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
-  virtual void drawOval(jint, jint, jint, jint);
-  virtual void fillOval(jint, jint, jint, jint);
-  virtual void drawArc(jint, jint, jint, jint, jint, jint);
-  virtual void fillArc(jint, jint, jint, jint, jint, jint);
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawBytes(JArray< jbyte > *, jint, jint, jint, jint);
-  virtual void drawChars(JArray< jchar > *, jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
-  virtual void copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void dispose();
-  virtual jboolean isDrawingBuffer();
-  virtual void setDebugOptions(jint);
-  virtual jint getDebugOptions();
-private:
-  ::java::lang::String * prefix();
-public:
-  static const jint LOG_OPTION = 1;
-  static const jint FLASH_OPTION = 2;
-  static const jint BUFFERED_OPTION = 4;
-  static const jint NONE_OPTION = -1;
-public: // actually package-private
-  static ::java::awt::Color * debugFlashColor;
-  static jint debugFlashCount;
-  static jint debugFlashTime;
-  static ::java::io::PrintStream * debugLogStream;
-  static jint counter;
-  ::java::awt::Graphics * __attribute__((aligned(__alignof__( ::java::awt::Graphics)))) graphics;
-  ::java::awt::Image * buffer;
-  jint debugOptions;
-  jint graphicsID;
-  jint xOffset;
-  jint yOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DebugGraphics__
diff --git a/libjava/javax/swing/DefaultBoundedRangeModel.h b/libjava/javax/swing/DefaultBoundedRangeModel.h
deleted file mode 100644
index 61d780d7a4a..00000000000
--- a/libjava/javax/swing/DefaultBoundedRangeModel.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultBoundedRangeModel__
-#define __javax_swing_DefaultBoundedRangeModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultBoundedRangeModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultBoundedRangeModel : public ::java::lang::Object
-{
-
-public:
-  DefaultBoundedRangeModel();
-  DefaultBoundedRangeModel(jint, jint, jint, jint);
-  virtual ::java::lang::String * toString();
-  virtual jint getValue();
-  virtual void setValue(jint);
-  virtual jint getExtent();
-  virtual void setExtent(jint);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual void setRangeProperties(jint, jint, jint, jint, jboolean);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 5034068491295259790LL;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  jint value;
-  jint extent;
-  jint minimum;
-  jint maximum;
-  jboolean isAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultBoundedRangeModel__
diff --git a/libjava/javax/swing/DefaultButtonModel.h b/libjava/javax/swing/DefaultButtonModel.h
deleted file mode 100644
index 735898ddb1c..00000000000
--- a/libjava/javax/swing/DefaultButtonModel.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultButtonModel__
-#define __javax_swing_DefaultButtonModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ButtonGroup;
-        class DefaultButtonModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultButtonModel : public ::java::lang::Object
-{
-
-public:
-  DefaultButtonModel();
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
-  virtual void fireStateChanged();
-public:
-  virtual jboolean isArmed();
-  virtual void setArmed(jboolean);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual void setPressed(jboolean);
-  virtual jboolean isPressed();
-  virtual void setRollover(jboolean);
-  virtual void setSelected(jboolean);
-  virtual jboolean isSelected();
-  virtual jboolean isRollover();
-  virtual jint getMnemonic();
-  virtual void setMnemonic(jint);
-  virtual void setActionCommand(::java::lang::String *);
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setGroup(::javax::swing::ButtonGroup *);
-  virtual ::javax::swing::ButtonGroup * getGroup();
-private:
-  static const jlong serialVersionUID = -5342609566534980231LL;
-public:
-  static const jint ARMED = 1;
-  static const jint ENABLED = 8;
-  static const jint PRESSED = 4;
-  static const jint ROLLOVER = 16;
-  static const jint SELECTED = 2;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) stateMask;
-  ::javax::swing::event::EventListenerList * listenerList;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  ::javax::swing::ButtonGroup * group;
-  jint mnemonic;
-  ::java::lang::String * actionCommand;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultButtonModel__
diff --git a/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h b/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h
deleted file mode 100644
index a571c5c5a8c..00000000000
--- a/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor$EditorDelegate__
-#define __javax_swing_DefaultCellEditor$EditorDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$EditorDelegate;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor$EditorDelegate : public ::java::lang::Object
-{
-
-public: // actually protected
-  DefaultCellEditor$EditorDelegate(::javax::swing::DefaultCellEditor *);
-public:
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getCellEditorValue();
-  virtual jboolean isCellEditable(::java::util::EventObject *);
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-  virtual jboolean stopCellEditing();
-  virtual void cancelCellEditing();
-  virtual jboolean startCellEditing(::java::util::EventObject *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  virtual void fireEditingStopped();
-  virtual void fireEditingCanceled();
-private:
-  static const jlong serialVersionUID = -1420007406015481933LL;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public: // actually package-private
-  ::javax::swing::DefaultCellEditor * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor$EditorDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h b/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h
deleted file mode 100644
index 08ecd3d5939..00000000000
--- a/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
-#define __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
-
-#pragma interface
-
-#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$JCheckBoxDelegate;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor$JCheckBoxDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
-{
-
-  DefaultCellEditor$JCheckBoxDelegate(::javax::swing::DefaultCellEditor *);
-public:
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getCellEditorValue();
-public: // actually package-private
-  DefaultCellEditor$JCheckBoxDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JCheckBoxDelegate *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h b/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h
deleted file mode 100644
index abfa15cc767..00000000000
--- a/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor$JComboBoxDelegate__
-#define __javax_swing_DefaultCellEditor$JComboBoxDelegate__
-
-#pragma interface
-
-#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$JComboBoxDelegate;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor$JComboBoxDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
-{
-
-  DefaultCellEditor$JComboBoxDelegate(::javax::swing::DefaultCellEditor *);
-public:
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getCellEditorValue();
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-public: // actually package-private
-  DefaultCellEditor$JComboBoxDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JComboBoxDelegate *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor$JComboBoxDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h b/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h
deleted file mode 100644
index dcaf8f1781e..00000000000
--- a/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor$JTextFieldDelegate__
-#define __javax_swing_DefaultCellEditor$JTextFieldDelegate__
-
-#pragma interface
-
-#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$JTextFieldDelegate;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor$JTextFieldDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
-{
-
-  DefaultCellEditor$JTextFieldDelegate(::javax::swing::DefaultCellEditor *);
-public:
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getCellEditorValue();
-public: // actually package-private
-  DefaultCellEditor$JTextFieldDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JTextFieldDelegate *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor$JTextFieldDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor.h b/libjava/javax/swing/DefaultCellEditor.h
deleted file mode 100644
index 0c62413be2d..00000000000
--- a/libjava/javax/swing/DefaultCellEditor.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor__
-#define __javax_swing_DefaultCellEditor__
-
-#pragma interface
-
-#include <javax/swing/AbstractCellEditor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$EditorDelegate;
-        class JCheckBox;
-        class JComboBox;
-        class JComponent;
-        class JTable;
-        class JTextField;
-        class JTree;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor : public ::javax::swing::AbstractCellEditor
-{
-
-public:
-  DefaultCellEditor(::javax::swing::JTextField *);
-  DefaultCellEditor(::javax::swing::JCheckBox *);
-  DefaultCellEditor(::javax::swing::JComboBox *);
-  virtual ::java::awt::Component * getComponent();
-  virtual jint getClickCountToStart();
-  virtual void setClickCountToStart(jint);
-  virtual ::java::lang::Object * getCellEditorValue();
-  virtual jboolean isCellEditable(::java::util::EventObject *);
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-  virtual jboolean stopCellEditing();
-  virtual void cancelCellEditing();
-  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
-  virtual ::java::awt::Component * getTableCellEditorComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jint, jint);
-private:
-  static const jlong serialVersionUID = 3564035141373880027LL;
-public: // actually protected
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::javax::swing::AbstractCellEditor)))) editorComponent;
-  ::javax::swing::DefaultCellEditor$EditorDelegate * delegate;
-  jint clickCountToStart;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor__
diff --git a/libjava/javax/swing/DefaultComboBoxModel.h b/libjava/javax/swing/DefaultComboBoxModel.h
deleted file mode 100644
index 9c5e721f750..00000000000
--- a/libjava/javax/swing/DefaultComboBoxModel.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultComboBoxModel__
-#define __javax_swing_DefaultComboBoxModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultComboBoxModel;
-    }
-  }
-}
-
-class javax::swing::DefaultComboBoxModel : public ::javax::swing::AbstractListModel
-{
-
-public:
-  DefaultComboBoxModel();
-  DefaultComboBoxModel(JArray< ::java::lang::Object * > *);
-  DefaultComboBoxModel(::java::util::Vector *);
-  virtual void addElement(::java::lang::Object *);
-  virtual void removeElementAt(jint);
-  virtual void insertElementAt(::java::lang::Object *, jint);
-  virtual void removeElement(::java::lang::Object *);
-  virtual void removeAllElements();
-  virtual jint getSize();
-  virtual void setSelectedItem(::java::lang::Object *);
-  virtual ::java::lang::Object * getSelectedItem();
-  virtual ::java::lang::Object * getElementAt(jint);
-  virtual jint getIndexOf(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 6698657703676921904LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) list;
-  ::java::lang::Object * selectedItem;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultComboBoxModel__
diff --git a/libjava/javax/swing/DefaultDesktopManager.h b/libjava/javax/swing/DefaultDesktopManager.h
deleted file mode 100644
index 2857f0dfbfc..00000000000
--- a/libjava/javax/swing/DefaultDesktopManager.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultDesktopManager__
-#define __javax_swing_DefaultDesktopManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultDesktopManager;
-        class JComponent;
-        class JInternalFrame;
-    }
-  }
-}
-
-class javax::swing::DefaultDesktopManager : public ::java::lang::Object
-{
-
-public:
-  DefaultDesktopManager();
-  virtual void openFrame(::javax::swing::JInternalFrame *);
-  virtual void closeFrame(::javax::swing::JInternalFrame *);
-  virtual void maximizeFrame(::javax::swing::JInternalFrame *);
-  virtual void minimizeFrame(::javax::swing::JInternalFrame *);
-  virtual void iconifyFrame(::javax::swing::JInternalFrame *);
-  virtual void deiconifyFrame(::javax::swing::JInternalFrame *);
-  virtual void activateFrame(::javax::swing::JInternalFrame *);
-  virtual void deactivateFrame(::javax::swing::JInternalFrame *);
-  virtual void beginDraggingFrame(::javax::swing::JComponent *);
-  virtual void dragFrame(::javax::swing::JComponent *, jint, jint);
-  virtual void endDraggingFrame(::javax::swing::JComponent *);
-  virtual void beginResizingFrame(::javax::swing::JComponent *, jint);
-  virtual void resizeFrame(::javax::swing::JComponent *, jint, jint, jint, jint);
-  virtual void endResizingFrame(::javax::swing::JComponent *);
-  virtual void setBoundsForFrame(::javax::swing::JComponent *, jint, jint, jint, jint);
-public: // actually protected
-  virtual void removeIconFor(::javax::swing::JInternalFrame *);
-  virtual ::java::awt::Rectangle * getBoundsForIconOf(::javax::swing::JInternalFrame *);
-  virtual void setPreviousBounds(::javax::swing::JInternalFrame *, ::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * getPreviousBounds(::javax::swing::JInternalFrame *);
-  virtual void setWasIcon(::javax::swing::JInternalFrame *, ::java::lang::Boolean *);
-  virtual jboolean wasIcon(::javax::swing::JInternalFrame *);
-private:
-  static const jlong serialVersionUID = 4657624909838017887LL;
-public: // actually package-private
-  static ::java::lang::String * WAS_ICON_ONCE_PROPERTY;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) currentDragMode;
-  ::java::awt::Rectangle * dragCache;
-  ::java::awt::Container * pane;
-  JArray< ::java::awt::Rectangle * > * iconRects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultDesktopManager__
diff --git a/libjava/javax/swing/DefaultFocusManager.h b/libjava/javax/swing/DefaultFocusManager.h
deleted file mode 100644
index a1eec270a61..00000000000
--- a/libjava/javax/swing/DefaultFocusManager.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultFocusManager__
-#define __javax_swing_DefaultFocusManager__
-
-#pragma interface
-
-#include <javax/swing/FocusManager.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultFocusManager;
-    }
-  }
-}
-
-class javax::swing::DefaultFocusManager : public ::javax::swing::FocusManager
-{
-
-public:
-  DefaultFocusManager();
-  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *);
-  virtual void focusNextComponent(::java::awt::Component *);
-  virtual void focusPreviousComponent(::java::awt::Component *);
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
-  virtual jboolean compareTabOrder(::java::awt::Component *, ::java::awt::Component *);
-private:
-  ::java::util::Stack * __attribute__((aligned(__alignof__( ::javax::swing::FocusManager)))) historyStack;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultFocusManager__
diff --git a/libjava/javax/swing/DefaultListCellRenderer$UIResource.h b/libjava/javax/swing/DefaultListCellRenderer$UIResource.h
deleted file mode 100644
index 91435fb16f6..00000000000
--- a/libjava/javax/swing/DefaultListCellRenderer$UIResource.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultListCellRenderer$UIResource__
-#define __javax_swing_DefaultListCellRenderer$UIResource__
-
-#pragma interface
-
-#include <javax/swing/DefaultListCellRenderer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListCellRenderer$UIResource;
-    }
-  }
-}
-
-class javax::swing::DefaultListCellRenderer$UIResource : public ::javax::swing::DefaultListCellRenderer
-{
-
-public:
-  DefaultListCellRenderer$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultListCellRenderer$UIResource__
diff --git a/libjava/javax/swing/DefaultListCellRenderer.h b/libjava/javax/swing/DefaultListCellRenderer.h
deleted file mode 100644
index 320767aa579..00000000000
--- a/libjava/javax/swing/DefaultListCellRenderer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultListCellRenderer__
-#define __javax_swing_DefaultListCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListCellRenderer;
-        class JList;
-      namespace border
-      {
-          class Border;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultListCellRenderer : public ::javax::swing::JLabel
-{
-
-public:
-  DefaultListCellRenderer();
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-  virtual void validate();
-  virtual void revalidate();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void repaint(::java::awt::Rectangle *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jbyte, jbyte);
-  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
-  virtual void firePropertyChange(::java::lang::String *, jshort, jshort);
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-  virtual void firePropertyChange(::java::lang::String *, jlong, jlong);
-  virtual void firePropertyChange(::java::lang::String *, jfloat, jfloat);
-  virtual void firePropertyChange(::java::lang::String *, jdouble, jdouble);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-private:
-  static const jlong serialVersionUID = 7708947179685189462LL;
-public: // actually protected
-  static ::javax::swing::border::Border * noFocusBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultListCellRenderer__
diff --git a/libjava/javax/swing/DefaultListModel.h b/libjava/javax/swing/DefaultListModel.h
deleted file mode 100644
index 67ca91bdc51..00000000000
--- a/libjava/javax/swing/DefaultListModel.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultListModel__
-#define __javax_swing_DefaultListModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListModel;
-    }
-  }
-}
-
-class javax::swing::DefaultListModel : public ::javax::swing::AbstractListModel
-{
-
-public:
-  DefaultListModel();
-  virtual ::java::lang::Object * elementAt(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint indexOf(::java::lang::Object *, jint);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *, jint);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual void addElement(::java::lang::Object *);
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual void copyInto(JArray< ::java::lang::Object * > *);
-  virtual void clear();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jboolean isEmpty();
-  virtual ::java::util::Enumeration * elements();
-  virtual void trimToSize();
-  virtual void ensureCapacity(jint);
-  virtual void setSize(jint);
-  virtual jint capacity();
-  virtual ::java::lang::Object * firstElement();
-  virtual ::java::lang::Object * lastElement();
-  virtual void setElementAt(::java::lang::Object *, jint);
-  virtual void removeElementAt(jint);
-  virtual void insertElementAt(::java::lang::Object *, jint);
-  virtual jboolean removeElement(::java::lang::Object *);
-  virtual void removeAllElements();
-  virtual void removeRange(jint, jint);
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-private:
-  static const jlong serialVersionUID = 2315945659722172272LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) elements__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultListModel__
diff --git a/libjava/javax/swing/DefaultListSelectionModel.h b/libjava/javax/swing/DefaultListSelectionModel.h
deleted file mode 100644
index 0a0ed22a363..00000000000
--- a/libjava/javax/swing/DefaultListSelectionModel.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultListSelectionModel__
-#define __javax_swing_DefaultListSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListSelectionModel;
-      namespace event
-      {
-          class EventListenerList;
-          class ListSelectionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultListSelectionModel : public ::java::lang::Object
-{
-
-public:
-  DefaultListSelectionModel();
-  virtual jint getSelectionMode();
-  virtual void setSelectionMode(jint);
-  virtual jint getAnchorSelectionIndex();
-  virtual void setAnchorSelectionIndex(jint);
-  virtual jint getLeadSelectionIndex();
-  virtual void setLeadSelectionIndex(jint);
-  virtual void moveLeadSelectionIndex(jint);
-  virtual jboolean isLeadAnchorNotificationEnabled();
-  virtual void setLeadAnchorNotificationEnabled(jboolean);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual jboolean isSelectionEmpty();
-  virtual jint getMinSelectionIndex();
-  virtual jint getMaxSelectionIndex();
-  virtual jboolean isSelectedIndex(jint);
-  virtual void addSelectionInterval(jint, jint);
-  virtual void removeSelectionInterval(jint, jint);
-  virtual void clearSelection();
-private:
-  void fireDifference(::java::util::BitSet *, ::java::util::BitSet *);
-public:
-  virtual void setSelectionInterval(jint, jint);
-  virtual void insertIndexInterval(jint, jint, jboolean);
-  virtual void removeIndexInterval(jint, jint);
-public: // actually protected
-  virtual void fireValueChanged(jboolean);
-  virtual void fireValueChanged(jint, jint);
-  virtual void fireValueChanged(jint, jint, jboolean);
-public:
-  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *);
-  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ListSelectionListener * > * getListSelectionListeners();
-  virtual ::java::lang::Object * clone();
-private:
-  static const jlong serialVersionUID = -5718799865110415860LL;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public: // actually package-private
-  jint selectionMode;
-  jint leadSelectionIndex;
-  jint anchorSelectionIndex;
-public: // actually protected
-  jboolean leadAnchorNotificationEnabled;
-public: // actually package-private
-  jboolean valueIsAdjusting;
-  ::java::util::BitSet * sel;
-  ::java::lang::Object * oldSel;
-  jboolean setLeadCalledFromAdd;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultListSelectionModel__
diff --git a/libjava/javax/swing/DefaultSingleSelectionModel.h b/libjava/javax/swing/DefaultSingleSelectionModel.h
deleted file mode 100644
index 8ea8f8e796d..00000000000
--- a/libjava/javax/swing/DefaultSingleSelectionModel.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultSingleSelectionModel__
-#define __javax_swing_DefaultSingleSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultSingleSelectionModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultSingleSelectionModel : public ::java::lang::Object
-{
-
-public:
-  DefaultSingleSelectionModel();
-  virtual jint getSelectedIndex();
-  virtual void setSelectedIndex(jint);
-  virtual void clearSelection();
-  virtual jboolean isSelected();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-private:
-  static const jlong serialVersionUID = 3676229404753786004LL;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultSingleSelectionModel__
diff --git a/libjava/javax/swing/DesktopManager.h b/libjava/javax/swing/DesktopManager.h
deleted file mode 100644
index 7981bdbb5aa..00000000000
--- a/libjava/javax/swing/DesktopManager.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DesktopManager__
-#define __javax_swing_DesktopManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DesktopManager;
-        class JComponent;
-        class JInternalFrame;
-    }
-  }
-}
-
-class javax::swing::DesktopManager : public ::java::lang::Object
-{
-
-public:
-  virtual void openFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void closeFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void maximizeFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void minimizeFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void iconifyFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void deiconifyFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void activateFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void deactivateFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void beginDraggingFrame(::javax::swing::JComponent *) = 0;
-  virtual void dragFrame(::javax::swing::JComponent *, jint, jint) = 0;
-  virtual void endDraggingFrame(::javax::swing::JComponent *) = 0;
-  virtual void beginResizingFrame(::javax::swing::JComponent *, jint) = 0;
-  virtual void resizeFrame(::javax::swing::JComponent *, jint, jint, jint, jint) = 0;
-  virtual void endResizingFrame(::javax::swing::JComponent *) = 0;
-  virtual void setBoundsForFrame(::javax::swing::JComponent *, jint, jint, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_DesktopManager__
diff --git a/libjava/javax/swing/FocusManager$WrappingFocusManager.h b/libjava/javax/swing/FocusManager$WrappingFocusManager.h
deleted file mode 100644
index 6ff193c5359..00000000000
--- a/libjava/javax/swing/FocusManager$WrappingFocusManager.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_FocusManager$WrappingFocusManager__
-#define __javax_swing_FocusManager$WrappingFocusManager__
-
-#pragma interface
-
-#include <javax/swing/FocusManager.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-        class Container;
-        class FocusTraversalPolicy;
-        class KeyEventDispatcher;
-        class KeyEventPostProcessor;
-        class KeyboardFocusManager;
-        class Window;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class VetoableChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class FocusManager$WrappingFocusManager;
-    }
-  }
-}
-
-class javax::swing::FocusManager$WrappingFocusManager : public ::javax::swing::FocusManager
-{
-
-public: // actually package-private
-  FocusManager$WrappingFocusManager(::java::awt::KeyboardFocusManager *);
-public:
-  virtual jboolean dispatchEvent(::java::awt::AWTEvent *);
-  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void downFocusCycle(::java::awt::Container *);
-  virtual void upFocusCycle(::java::awt::Container *);
-  virtual void focusNextComponent(::java::awt::Component *);
-  virtual void focusPreviousComponent(::java::awt::Component *);
-  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *);
-  virtual void addKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
-  virtual void addKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void clearGlobalFocusOwner();
-  virtual ::java::awt::Window * getActiveWindow();
-  virtual ::java::awt::Container * getCurrentFocusCycleRoot();
-  virtual ::java::util::Set * getDefaultFocusTraversalKeys(jint);
-  virtual ::java::awt::FocusTraversalPolicy * getDefaultFocusTraversalPolicy();
-  virtual ::java::awt::Window * getFocusedWindow();
-  virtual ::java::awt::Component * getFocusOwner();
-  virtual ::java::awt::Component * getPermanentFocusOwner();
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners(::java::lang::String *);
-  virtual void removeKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
-  virtual void removeKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void setDefaultFocusTraversalKeys(jint, ::java::util::Set *);
-  virtual void setDefaultFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
-  virtual void setGlobalCurrentFocusCycleRoot(::java::awt::Container *);
-private:
-  ::java::awt::KeyboardFocusManager * __attribute__((aligned(__alignof__( ::javax::swing::FocusManager)))) wrapped;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_FocusManager$WrappingFocusManager__
diff --git a/libjava/javax/swing/FocusManager.h b/libjava/javax/swing/FocusManager.h
deleted file mode 100644
index 0bf93943890..00000000000
--- a/libjava/javax/swing/FocusManager.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_FocusManager__
-#define __javax_swing_FocusManager__
-
-#pragma interface
-
-#include <java/awt/DefaultKeyboardFocusManager.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class FocusManager;
-    }
-  }
-}
-
-class javax::swing::FocusManager : public ::java::awt::DefaultKeyboardFocusManager
-{
-
-public:
-  FocusManager();
-  static ::javax::swing::FocusManager * getCurrentManager();
-  static void setCurrentManager(::javax::swing::FocusManager *);
-  static void disableSwingFocusManager();
-  static jboolean isFocusManagerEnabled();
-  static ::java::lang::String * FOCUS_MANAGER_CLASS_PROPERTY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_FocusManager__
diff --git a/libjava/javax/swing/GrayFilter.h b/libjava/javax/swing/GrayFilter.h
deleted file mode 100644
index 436c3763a42..00000000000
--- a/libjava/javax/swing/GrayFilter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_GrayFilter__
-#define __javax_swing_GrayFilter__
-
-#pragma interface
-
-#include <java/awt/image/RGBImageFilter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class GrayFilter;
-    }
-  }
-}
-
-class javax::swing::GrayFilter : public ::java::awt::image::RGBImageFilter
-{
-
-public:
-  GrayFilter(jboolean, jint);
-  static ::java::awt::Image * createDisabledImage(::java::awt::Image *);
-  virtual jint filterRGB(jint, jint, jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::image::RGBImageFilter)))) b;
-  jdouble p;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_GrayFilter__
diff --git a/libjava/javax/swing/Icon.h b/libjava/javax/swing/Icon.h
deleted file mode 100644
index 7ab6cfe4d21..00000000000
--- a/libjava/javax/swing/Icon.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Icon__
-#define __javax_swing_Icon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-    }
-  }
-}
-
-class javax::swing::Icon : public ::java::lang::Object
-{
-
-public:
-  virtual jint getIconHeight() = 0;
-  virtual jint getIconWidth() = 0;
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_Icon__
diff --git a/libjava/javax/swing/ImageIcon$1.h b/libjava/javax/swing/ImageIcon$1.h
deleted file mode 100644
index 529be408a28..00000000000
--- a/libjava/javax/swing/ImageIcon$1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ImageIcon$1__
-#define __javax_swing_ImageIcon$1__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ImageIcon$1;
-    }
-  }
-}
-
-class javax::swing::ImageIcon$1 : public ::java::awt::Component
-{
-
-public: // actually package-private
-  ImageIcon$1();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ImageIcon$1__
diff --git a/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h b/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h
deleted file mode 100644
index 05d2323e283..00000000000
--- a/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ImageIcon$AccessibleImageIcon__
-#define __javax_swing_ImageIcon$AccessibleImageIcon__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class ImageIcon;
-        class ImageIcon$AccessibleImageIcon;
-    }
-  }
-}
-
-class javax::swing::ImageIcon$AccessibleImageIcon : public ::javax::accessibility::AccessibleContext
-{
-
-public: // actually protected
-  ImageIcon$AccessibleImageIcon(::javax::swing::ImageIcon *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::Accessible * getAccessibleParent();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::lang::String * getAccessibleIconDescription();
-  virtual void setAccessibleIconDescription(::java::lang::String *);
-  virtual jint getAccessibleIconHeight();
-  virtual jint getAccessibleIconWidth();
-private:
-  static const jlong serialVersionUID = 2113430526551336564LL;
-public: // actually package-private
-  ::javax::swing::ImageIcon * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ImageIcon$AccessibleImageIcon__
diff --git a/libjava/javax/swing/ImageIcon.h b/libjava/javax/swing/ImageIcon.h
deleted file mode 100644
index 4e3d8d90273..00000000000
--- a/libjava/javax/swing/ImageIcon.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ImageIcon__
-#define __javax_swing_ImageIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Image;
-        class MediaTracker;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class ImageIcon;
-    }
-  }
-}
-
-class javax::swing::ImageIcon : public ::java::lang::Object
-{
-
-public:
-  ImageIcon();
-  ImageIcon(::java::lang::String *);
-  ImageIcon(::java::lang::String *, ::java::lang::String *);
-  ImageIcon(JArray< jbyte > *);
-  ImageIcon(JArray< jbyte > *, ::java::lang::String *);
-  ImageIcon(::java::net::URL *);
-  ImageIcon(::java::net::URL *, ::java::lang::String *);
-  ImageIcon(::java::awt::Image *);
-  ImageIcon(::java::awt::Image *, ::java::lang::String *);
-  virtual ::java::awt::image::ImageObserver * getImageObserver();
-  virtual void setImageObserver(::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * getImage();
-  virtual void setImage(::java::awt::Image *);
-  virtual ::java::lang::String * getDescription();
-  virtual void setDescription(::java::lang::String *);
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually protected
-  virtual void loadImage(::java::awt::Image *);
-public:
-  virtual jint getImageLoadStatus();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 532615968316031794LL;
-public: // actually protected
-  static ::java::awt::Component * component;
-  static ::java::awt::MediaTracker * tracker;
-private:
-  static jint id;
-public: // actually package-private
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::lang::String * description;
-  ::java::awt::image::ImageObserver * observer;
-private:
-  jint loadStatus;
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ImageIcon__
diff --git a/libjava/javax/swing/InputMap.h b/libjava/javax/swing/InputMap.h
deleted file mode 100644
index 5846eeb25af..00000000000
--- a/libjava/javax/swing/InputMap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_InputMap__
-#define __javax_swing_InputMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class InputMap;
-        class KeyStroke;
-    }
-  }
-}
-
-class javax::swing::InputMap : public ::java::lang::Object
-{
-
-public:
-  InputMap();
-  virtual ::java::lang::Object * get(::javax::swing::KeyStroke *);
-  virtual void put(::javax::swing::KeyStroke *, ::java::lang::Object *);
-  virtual void remove(::javax::swing::KeyStroke *);
-  virtual ::javax::swing::InputMap * getParent();
-  virtual void setParent(::javax::swing::InputMap *);
-  virtual jint size();
-  virtual void clear();
-  virtual JArray< ::javax::swing::KeyStroke * > * keys();
-  virtual JArray< ::javax::swing::KeyStroke * > * allKeys();
-private:
-  static const jlong serialVersionUID = -5429059542008604257LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inputMap;
-  ::javax::swing::InputMap * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_InputMap__
diff --git a/libjava/javax/swing/InputVerifier.h b/libjava/javax/swing/InputVerifier.h
deleted file mode 100644
index 986647e1bb3..00000000000
--- a/libjava/javax/swing/InputVerifier.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_InputVerifier__
-#define __javax_swing_InputVerifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class InputVerifier;
-        class JComponent;
-    }
-  }
-}
-
-class javax::swing::InputVerifier : public ::java::lang::Object
-{
-
-public:
-  InputVerifier();
-  virtual jboolean verify(::javax::swing::JComponent *) = 0;
-  virtual jboolean shouldYieldFocus(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_InputVerifier__
diff --git a/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h b/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h
deleted file mode 100644
index 4573093d46d..00000000000
--- a/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_InternalFrameFocusTraversalPolicy__
-#define __javax_swing_InternalFrameFocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/awt/FocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class InternalFrameFocusTraversalPolicy;
-        class JInternalFrame;
-    }
-  }
-}
-
-class javax::swing::InternalFrameFocusTraversalPolicy : public ::java::awt::FocusTraversalPolicy
-{
-
-public:
-  InternalFrameFocusTraversalPolicy();
-  virtual ::java::awt::Component * getInitialComponent(::javax::swing::JInternalFrame *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_InternalFrameFocusTraversalPolicy__
diff --git a/libjava/javax/swing/JApplet$AccessibleJApplet.h b/libjava/javax/swing/JApplet$AccessibleJApplet.h
deleted file mode 100644
index d6aea498e1d..00000000000
--- a/libjava/javax/swing/JApplet$AccessibleJApplet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JApplet$AccessibleJApplet__
-#define __javax_swing_JApplet$AccessibleJApplet__
-
-#pragma interface
-
-#include <java/applet/Applet$AccessibleApplet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JApplet;
-        class JApplet$AccessibleJApplet;
-    }
-  }
-}
-
-class javax::swing::JApplet$AccessibleJApplet : public ::java::applet::Applet$AccessibleApplet
-{
-
-public: // actually protected
-  JApplet$AccessibleJApplet(::javax::swing::JApplet *);
-public: // actually package-private
-  ::javax::swing::JApplet * __attribute__((aligned(__alignof__( ::java::applet::Applet$AccessibleApplet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JApplet$AccessibleJApplet__
diff --git a/libjava/javax/swing/JApplet.h b/libjava/javax/swing/JApplet.h
deleted file mode 100644
index 16cdbcf69da..00000000000
--- a/libjava/javax/swing/JApplet.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JApplet__
-#define __javax_swing_JApplet__
-
-#pragma interface
-
-#include <java/applet/Applet.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Graphics;
-        class LayoutManager;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JApplet;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-    }
-  }
-}
-
-class javax::swing::JApplet : public ::java::applet::Applet
-{
-
-public:
-  JApplet();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JRootPane * getRootPane();
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual void remove(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void update(::java::awt::Graphics *);
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::applet::Applet)))) accessibleContext;
-private:
-  static const jlong serialVersionUID = 7269359214497372587LL;
-public: // actually protected
-  ::javax::swing::JRootPane * rootPane;
-  jboolean rootPaneCheckingEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JApplet__
diff --git a/libjava/javax/swing/JButton$AccessibleJButton.h b/libjava/javax/swing/JButton$AccessibleJButton.h
deleted file mode 100644
index b8f0f3ed85a..00000000000
--- a/libjava/javax/swing/JButton$AccessibleJButton.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JButton$AccessibleJButton__
-#define __javax_swing_JButton$AccessibleJButton__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JButton;
-        class JButton$AccessibleJButton;
-    }
-  }
-}
-
-class javax::swing::JButton$AccessibleJButton : public ::javax::swing::AbstractButton$AccessibleAbstractButton
-{
-
-public: // actually protected
-  JButton$AccessibleJButton(::javax::swing::JButton *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JButton * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JButton$AccessibleJButton__
diff --git a/libjava/javax/swing/JButton.h b/libjava/javax/swing/JButton.h
deleted file mode 100644
index a151bae8a8a..00000000000
--- a/libjava/javax/swing/JButton.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JButton__
-#define __javax_swing_JButton__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JButton;
-    }
-  }
-}
-
-class javax::swing::JButton : public ::javax::swing::AbstractButton
-{
-
-public:
-  JButton();
-  JButton(::javax::swing::Action *);
-  JButton(::javax::swing::Icon *);
-  JButton(::java::lang::String *);
-  JButton(::java::lang::String *, ::javax::swing::Icon *);
-public: // actually protected
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean isDefaultButton();
-  virtual jboolean isDefaultCapable();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void removeNotify();
-  virtual void setDefaultCapable(jboolean);
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = -1907255238954382202LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton)))) defaultCapable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JButton__
diff --git a/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h b/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h
deleted file mode 100644
index 34d711e395f..00000000000
--- a/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JCheckBox$AccessibleJCheckBox__
-#define __javax_swing_JCheckBox$AccessibleJCheckBox__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton$AccessibleJToggleButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JCheckBox;
-        class JCheckBox$AccessibleJCheckBox;
-    }
-  }
-}
-
-class javax::swing::JCheckBox$AccessibleJCheckBox : public ::javax::swing::JToggleButton$AccessibleJToggleButton
-{
-
-public: // actually protected
-  JCheckBox$AccessibleJCheckBox(::javax::swing::JCheckBox *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JCheckBox * __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$AccessibleJToggleButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JCheckBox$AccessibleJCheckBox__
diff --git a/libjava/javax/swing/JCheckBox.h b/libjava/javax/swing/JCheckBox.h
deleted file mode 100644
index b57d5c1671b..00000000000
--- a/libjava/javax/swing/JCheckBox.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JCheckBox__
-#define __javax_swing_JCheckBox__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JCheckBox;
-    }
-  }
-}
-
-class javax::swing::JCheckBox : public ::javax::swing::JToggleButton
-{
-
-  void init();
-public:
-  JCheckBox();
-  JCheckBox(::javax::swing::Action *);
-  JCheckBox(::javax::swing::Icon *);
-  JCheckBox(::javax::swing::Icon *, jboolean);
-  JCheckBox(::java::lang::String *);
-  JCheckBox(::java::lang::String *, jboolean);
-  JCheckBox(::java::lang::String *, ::javax::swing::Icon *);
-  JCheckBox(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual jboolean isBorderPaintedFlat();
-  virtual void setBorderPaintedFlat(jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -5246739313864538930LL;
-public:
-  static ::java::lang::String * BORDER_PAINTED_FLAT_CHANGED_PROPERTY;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton)))) borderPaintedFlat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JCheckBox__
diff --git a/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h b/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h
deleted file mode 100644
index 5508976090a..00000000000
--- a/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
-#define __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JCheckBoxMenuItem;
-        class JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem;
-    }
-  }
-}
-
-class javax::swing::JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem : public ::javax::swing::JMenuItem$AccessibleJMenuItem
-{
-
-public: // actually protected
-  JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem(::javax::swing::JCheckBoxMenuItem *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 1079958073579370777LL;
-public: // actually package-private
-  ::javax::swing::JCheckBoxMenuItem * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
diff --git a/libjava/javax/swing/JCheckBoxMenuItem.h b/libjava/javax/swing/JCheckBoxMenuItem.h
deleted file mode 100644
index fcb3355228c..00000000000
--- a/libjava/javax/swing/JCheckBoxMenuItem.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JCheckBoxMenuItem__
-#define __javax_swing_JCheckBoxMenuItem__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JCheckBoxMenuItem;
-    }
-  }
-}
-
-class javax::swing::JCheckBoxMenuItem : public ::javax::swing::JMenuItem
-{
-
-public:
-  JCheckBoxMenuItem();
-  JCheckBoxMenuItem(::javax::swing::Icon *);
-  JCheckBoxMenuItem(::java::lang::String *);
-  JCheckBoxMenuItem(::javax::swing::Action *);
-  JCheckBoxMenuItem(::java::lang::String *, ::javax::swing::Icon *);
-  JCheckBoxMenuItem(::java::lang::String *, jboolean);
-  JCheckBoxMenuItem(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean getState();
-  virtual void setState(jboolean);
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual void requestFocus();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -6676402307973384715LL;
-  static ::java::lang::String * uiClassID;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem)))) state;
-  JArray< ::java::lang::Object * > * selectedObjects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JCheckBoxMenuItem__
diff --git a/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h b/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h
deleted file mode 100644
index 6a4ecf7318d..00000000000
--- a/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JColorChooser$AccessibleJColorChooser__
-#define __javax_swing_JColorChooser$AccessibleJColorChooser__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JColorChooser;
-        class JColorChooser$AccessibleJColorChooser;
-    }
-  }
-}
-
-class javax::swing::JColorChooser$AccessibleJColorChooser : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JColorChooser$AccessibleJColorChooser(::javax::swing::JColorChooser *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -2038297864782299082LL;
-public: // actually package-private
-  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JColorChooser$AccessibleJColorChooser__
diff --git a/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h b/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h
deleted file mode 100644
index 0b2093c2dee..00000000000
--- a/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JColorChooser$DefaultOKCancelListener__
-#define __javax_swing_JColorChooser$DefaultOKCancelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JColorChooser$DefaultOKCancelListener;
-        class JDialog;
-    }
-  }
-}
-
-class javax::swing::JColorChooser$DefaultOKCancelListener : public ::java::lang::Object
-{
-
-public:
-  JColorChooser$DefaultOKCancelListener(::javax::swing::JDialog *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JColorChooser$DefaultOKCancelListener__
diff --git a/libjava/javax/swing/JColorChooser$DefaultResetListener.h b/libjava/javax/swing/JColorChooser$DefaultResetListener.h
deleted file mode 100644
index 4167cbbcf5f..00000000000
--- a/libjava/javax/swing/JColorChooser$DefaultResetListener.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JColorChooser$DefaultResetListener__
-#define __javax_swing_JColorChooser$DefaultResetListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JColorChooser;
-        class JColorChooser$DefaultResetListener;
-    }
-  }
-}
-
-class javax::swing::JColorChooser$DefaultResetListener : public ::java::lang::Object
-{
-
-public:
-  JColorChooser$DefaultResetListener(::javax::swing::JColorChooser *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) chooser;
-  ::java::awt::Color * init;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JColorChooser$DefaultResetListener__
diff --git a/libjava/javax/swing/JColorChooser.h b/libjava/javax/swing/JColorChooser.h
deleted file mode 100644
index 66d0da60702..00000000000
--- a/libjava/javax/swing/JColorChooser.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JColorChooser__
-#define __javax_swing_JColorChooser__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JColorChooser;
-        class JComponent;
-        class JDialog;
-      namespace colorchooser
-      {
-          class AbstractColorChooserPanel;
-          class ColorSelectionModel;
-      }
-      namespace plaf
-      {
-          class ColorChooserUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JColorChooser : public ::javax::swing::JComponent
-{
-
-public:
-  JColorChooser();
-  JColorChooser(::java::awt::Color *);
-  JColorChooser(::javax::swing::colorchooser::ColorSelectionModel *);
-  virtual void setColor(::java::awt::Color *);
-  virtual void setColor(jint, jint, jint);
-  virtual void setColor(jint);
-  static ::java::awt::Color * showDialog(::java::awt::Component *, ::java::lang::String *, ::java::awt::Color *);
-public: // actually package-private
-  static void makeModal(::javax::swing::JDialog *);
-private:
-  static ::java::awt::Component * findParent(::java::awt::Component *);
-public:
-  static ::javax::swing::JDialog * createDialog(::java::awt::Component *, ::java::lang::String *, jboolean, ::javax::swing::JColorChooser *, ::java::awt::event::ActionListener *, ::java::awt::event::ActionListener *);
-  virtual ::javax::swing::plaf::ColorChooserUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ColorChooserUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::awt::Color * getColor();
-  virtual void setPreviewPanel(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * getPreviewPanel();
-  virtual void addChooserPanel(::javax::swing::colorchooser::AbstractColorChooserPanel *);
-  virtual ::javax::swing::colorchooser::AbstractColorChooserPanel * removeChooserPanel(::javax::swing::colorchooser::AbstractColorChooserPanel *);
-  virtual void setChooserPanels(JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > *);
-  virtual JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * getChooserPanels();
-  virtual ::javax::swing::colorchooser::ColorSelectionModel * getSelectionModel();
-  virtual void setSelectionModel(::javax::swing::colorchooser::ColorSelectionModel *);
-  virtual jboolean getDragEnabled();
-  virtual void setDragEnabled(jboolean);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 9168066781620640889LL;
-  ::javax::swing::colorchooser::ColorSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) selectionModel;
-  ::javax::swing::JComponent * previewPanel;
-  JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * chooserPanels;
-  jboolean dragEnabled;
-public:
-  static ::java::lang::String * SELECTION_MODEL_PROPERTY;
-  static ::java::lang::String * PREVIEW_PANEL_PROPERTY;
-  static ::java::lang::String * CHOOSER_PANELS_PROPERTY;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JColorChooser__
diff --git a/libjava/javax/swing/JComboBox$1.h b/libjava/javax/swing/JComboBox$1.h
deleted file mode 100644
index 46ba3ae1a6a..00000000000
--- a/libjava/javax/swing/JComboBox$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox$1__
-#define __javax_swing_JComboBox$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComboBox;
-        class JComboBox$1;
-    }
-  }
-}
-
-class javax::swing::JComboBox$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JComboBox$1(::javax::swing::JComboBox *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComboBox$1__
diff --git a/libjava/javax/swing/JComboBox$AccessibleJComboBox.h b/libjava/javax/swing/JComboBox$AccessibleJComboBox.h
deleted file mode 100644
index 7f8b2ca997a..00000000000
--- a/libjava/javax/swing/JComboBox$AccessibleJComboBox.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox$AccessibleJComboBox__
-#define __javax_swing_JComboBox$AccessibleJComboBox__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleAction;
-        class AccessibleRole;
-        class AccessibleSelection;
-    }
-    namespace swing
-    {
-        class JComboBox;
-        class JComboBox$AccessibleJComboBox;
-    }
-  }
-}
-
-class javax::swing::JComboBox$AccessibleJComboBox : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JComboBox$AccessibleJComboBox(::javax::swing::JComboBox *);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jint getAccessibleActionCount();
-  virtual jboolean doAccessibleAction(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-private:
-  static const jlong serialVersionUID = 8217828307256675666LL;
-public: // actually package-private
-  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComboBox$AccessibleJComboBox__
diff --git a/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h b/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h
deleted file mode 100644
index d968118ed66..00000000000
--- a/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox$DefaultKeySelectionManager__
-#define __javax_swing_JComboBox$DefaultKeySelectionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxModel;
-        class JComboBox;
-        class JComboBox$DefaultKeySelectionManager;
-    }
-  }
-}
-
-class javax::swing::JComboBox$DefaultKeySelectionManager : public ::java::lang::Object
-{
-
-  JComboBox$DefaultKeySelectionManager(::javax::swing::JComboBox *);
-public:
-  virtual jint selectionForKey(jchar, ::javax::swing::ComboBoxModel *);
-public: // actually package-private
-  JComboBox$DefaultKeySelectionManager(::javax::swing::JComboBox *, ::javax::swing::JComboBox$DefaultKeySelectionManager *);
-  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComboBox$DefaultKeySelectionManager__
diff --git a/libjava/javax/swing/JComboBox$KeySelectionManager.h b/libjava/javax/swing/JComboBox$KeySelectionManager.h
deleted file mode 100644
index 4d6314e8f42..00000000000
--- a/libjava/javax/swing/JComboBox$KeySelectionManager.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox$KeySelectionManager__
-#define __javax_swing_JComboBox$KeySelectionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxModel;
-        class JComboBox$KeySelectionManager;
-    }
-  }
-}
-
-class javax::swing::JComboBox$KeySelectionManager : public ::java::lang::Object
-{
-
-public:
-  virtual jint selectionForKey(jchar, ::javax::swing::ComboBoxModel *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_JComboBox$KeySelectionManager__
diff --git a/libjava/javax/swing/JComboBox.h b/libjava/javax/swing/JComboBox.h
deleted file mode 100644
index ef9f7147c79..00000000000
--- a/libjava/javax/swing/JComboBox.h
+++ /dev/null
@@ -1,164 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox__
-#define __javax_swing_JComboBox__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class ItemEvent;
-          class ItemListener;
-          class KeyEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class ComboBoxEditor;
-        class ComboBoxModel;
-        class JComboBox;
-        class JComboBox$KeySelectionManager;
-        class ListCellRenderer;
-      namespace event
-      {
-          class ListDataEvent;
-          class PopupMenuListener;
-      }
-      namespace plaf
-      {
-          class ComboBoxUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JComboBox : public ::javax::swing::JComponent
-{
-
-public:
-  JComboBox(::javax::swing::ComboBoxModel *);
-  JComboBox(JArray< ::java::lang::Object * > *);
-  JComboBox(::java::util::Vector *);
-  JComboBox();
-  virtual jboolean isEditable();
-public: // actually protected
-  virtual void installAncestorListener();
-public:
-  virtual void setUI(::javax::swing::plaf::ComboBoxUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::plaf::ComboBoxUI * getUI();
-  virtual void setModel(::javax::swing::ComboBoxModel *);
-  virtual ::javax::swing::ComboBoxModel * getModel();
-  virtual void setLightWeightPopupEnabled(jboolean);
-  virtual jboolean isLightWeightPopupEnabled();
-  virtual void setEditable(jboolean);
-  virtual void setMaximumRowCount(jint);
-  virtual jint getMaximumRowCount();
-  virtual void setRenderer(::javax::swing::ListCellRenderer *);
-  virtual ::javax::swing::ListCellRenderer * getRenderer();
-  virtual void setEditor(::javax::swing::ComboBoxEditor *);
-  virtual ::javax::swing::ComboBoxEditor * getEditor();
-  virtual void setSelectedItem(::java::lang::Object *);
-  virtual ::java::lang::Object * getSelectedItem();
-  virtual void setSelectedIndex(jint);
-  virtual jint getSelectedIndex();
-  virtual ::java::lang::Object * getPrototypeDisplayValue();
-  virtual void setPrototypeDisplayValue(::java::lang::Object *);
-  virtual void addItem(::java::lang::Object *);
-  virtual void insertItemAt(::java::lang::Object *, jint);
-  virtual void removeItem(::java::lang::Object *);
-  virtual void removeItemAt(jint);
-  virtual void removeAllItems();
-  virtual void showPopup();
-  virtual void hidePopup();
-  virtual void setPopupVisible(jboolean);
-  virtual jboolean isPopupVisible();
-  virtual void setActionCommand(::java::lang::String *);
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setAction(::javax::swing::Action *);
-  virtual ::javax::swing::Action * getAction();
-public: // actually protected
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
-  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void fireActionEvent();
-public:
-  virtual void firePopupMenuCanceled();
-  virtual void firePopupMenuWillBecomeInvisible();
-  virtual void firePopupMenuWillBecomeVisible();
-public: // actually protected
-  virtual void selectedItemChanged();
-public:
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean selectWithKeyChar(jchar);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void setEnabled(jboolean);
-  virtual void configureEditor(::javax::swing::ComboBoxEditor *, ::java::lang::Object *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void setKeySelectionManager(::javax::swing::JComboBox$KeySelectionManager *);
-  virtual ::javax::swing::JComboBox$KeySelectionManager * getKeySelectionManager();
-  virtual jint getItemCount();
-  virtual ::java::lang::Object * getItemAt(jint);
-public: // actually protected
-  virtual ::javax::swing::JComboBox$KeySelectionManager * createDefaultKeySelectionManager();
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual void addPopupMenuListener(::javax::swing::event::PopupMenuListener *);
-  virtual void removePopupMenuListener(::javax::swing::event::PopupMenuListener *);
-  virtual JArray< ::javax::swing::event::PopupMenuListener * > * getPopupMenuListeners();
-private:
-  static const jlong serialVersionUID = 5654585963292734470LL;
-  static const jint DEFAULT_MAXIMUM_ROW_COUNT = 8;
-public: // actually protected
-  ::javax::swing::ComboBoxModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dataModel;
-  ::javax::swing::ListCellRenderer * renderer;
-  ::javax::swing::ComboBoxEditor * editor;
-  jint maximumRowCount;
-  jboolean isEditable__;
-  ::java::lang::Object * selectedItemReminder;
-  ::javax::swing::JComboBox$KeySelectionManager * keySelectionManager;
-  ::java::lang::String * actionCommand;
-  jboolean lightWeightPopupEnabled;
-private:
-  ::javax::swing::Action * action;
-  ::java::lang::Object * prototypeDisplayValue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComboBox__
diff --git a/libjava/javax/swing/JComponent$1.h b/libjava/javax/swing/JComponent$1.h
deleted file mode 100644
index 22584337a0b..00000000000
--- a/libjava/javax/swing/JComponent$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$1__
-#define __javax_swing_JComponent$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JComponent$1;
-    }
-  }
-}
-
-class javax::swing::JComponent$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JComponent$1(::javax::swing::JComponent *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$1__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h b/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h
deleted file mode 100644
index 6b25d9aeaa9..00000000000
--- a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
-#define __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent$AccessibleJComponent;
-        class JComponent$AccessibleJComponent$AccessibleContainerHandler;
-    }
-  }
-}
-
-class javax::swing::JComponent$AccessibleJComponent$AccessibleContainerHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  JComponent$AccessibleJComponent$AccessibleContainerHandler(::javax::swing::JComponent$AccessibleJComponent *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  ::javax::swing::JComponent$AccessibleJComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h b/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h
deleted file mode 100644
index 50825416858..00000000000
--- a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
-#define __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent$AccessibleJComponent;
-        class JComponent$AccessibleJComponent$AccessibleFocusHandler;
-    }
-  }
-}
-
-class javax::swing::JComponent$AccessibleJComponent$AccessibleFocusHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  JComponent$AccessibleJComponent$AccessibleFocusHandler(::javax::swing::JComponent$AccessibleJComponent *);
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::JComponent$AccessibleJComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent.h b/libjava/javax/swing/JComponent$AccessibleJComponent.h
deleted file mode 100644
index d0a3546743f..00000000000
--- a/libjava/javax/swing/JComponent$AccessibleJComponent.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$AccessibleJComponent__
-#define __javax_swing_JComponent$AccessibleJComponent__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerListener;
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleKeyBinding;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JComponent$AccessibleJComponent;
-      namespace border
-      {
-          class Border;
-      }
-    }
-  }
-}
-
-class javax::swing::JComponent$AccessibleJComponent : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  JComponent$AccessibleJComponent(::javax::swing::JComponent *);
-public:
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually protected
-  virtual ::java::lang::String * getBorderTitle(::javax::swing::border::Border *);
-public:
-  virtual ::java::lang::String * getToolTipText();
-  virtual ::java::lang::String * getTitledBorderText();
-  virtual ::javax::accessibility::AccessibleKeyBinding * getAccessibleKeyBinding();
-private:
-  static const jlong serialVersionUID = -7047089700479897799LL;
-public: // actually protected
-  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) accessibleContainerHandler;
-  ::java::awt::event::FocusListener * accessibleFocusHandler;
-public: // actually package-private
-  ::javax::swing::JComponent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$AccessibleJComponent__
diff --git a/libjava/javax/swing/JComponent$ActionListenerProxy.h b/libjava/javax/swing/JComponent$ActionListenerProxy.h
deleted file mode 100644
index 9679e190935..00000000000
--- a/libjava/javax/swing/JComponent$ActionListenerProxy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$ActionListenerProxy__
-#define __javax_swing_JComponent$ActionListenerProxy__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent$ActionListenerProxy;
-    }
-  }
-}
-
-class javax::swing::JComponent$ActionListenerProxy : public ::javax::swing::AbstractAction
-{
-
-public:
-  JComponent$ActionListenerProxy(::java::awt::event::ActionListener *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::java::awt::event::ActionListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) target;
-  ::java::lang::String * bindingCommandName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$ActionListenerProxy__
diff --git a/libjava/javax/swing/JComponent.h b/libjava/javax/swing/JComponent.h
deleted file mode 100644
index a27b205093a..00000000000
--- a/libjava/javax/swing/JComponent.h
+++ /dev/null
@@ -1,296 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent__
-#define __javax_swing_JComponent__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Container;
-        class Dimension;
-        class Font;
-        class Graphics;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class ActionListener;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class VetoableChangeListener;
-        class VetoableChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class ActionMap;
-        class ComponentInputMap;
-        class InputMap;
-        class InputVerifier;
-        class JComponent;
-        class JPopupMenu;
-        class JRootPane;
-        class JToolTip;
-        class KeyStroke;
-        class TransferHandler;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class AncestorListener;
-          class EventListenerList;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JComponent : public ::java::awt::Container
-{
-
-public:
-  JComponent();
-private:
-  ::java::util::Hashtable * getClientProperties();
-public:
-  virtual ::java::lang::Object * getClientProperty(::java::lang::Object *);
-  virtual void putClientProperty(::java::lang::Object *, ::java::lang::Object *);
-  virtual void removeAncestorListener(::javax::swing::event::AncestorListener *);
-  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void addAncestorListener(::javax::swing::event::AncestorListener *);
-  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::AncestorListener * > * getAncestorListeners();
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
-public: // actually protected
-  virtual void fireVetoableChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual jfloat getAlignmentX();
-  virtual jfloat getAlignmentY();
-  virtual jboolean getAutoscrolls();
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual ::javax::swing::border::Border * getBorder();
-  virtual ::java::awt::Rectangle * getBounds(::java::awt::Rectangle *);
-public: // actually protected
-  virtual ::java::awt::Graphics * getComponentGraphics(::java::awt::Graphics *);
-public:
-  virtual jint getDebugGraphicsOptions();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * getInsets(::java::awt::Insets *);
-  virtual ::java::awt::Point * getLocation(::java::awt::Point *);
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Component * getNextFocusableComponent();
-  virtual JArray< ::javax::swing::KeyStroke * > * getRegisteredKeyStrokes();
-  virtual ::javax::swing::JRootPane * getRootPane();
-  virtual ::java::awt::Dimension * getSize(::java::awt::Dimension *);
-  virtual ::javax::swing::JToolTip * createToolTip();
-  virtual ::java::awt::Point * getToolTipLocation(::java::awt::event::MouseEvent *);
-  virtual void setToolTipText(::java::lang::String *);
-  virtual ::java::lang::String * getToolTipText();
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-  virtual jboolean getInheritsPopupMenu();
-  virtual void setInheritsPopupMenu(jboolean);
-  virtual ::javax::swing::JPopupMenu * getComponentPopupMenu();
-  virtual void setComponentPopupMenu(::javax::swing::JPopupMenu *);
-  virtual ::java::awt::Container * getTopLevelAncestor();
-  virtual void computeVisibleRect(::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * getVisibleRect();
-  virtual void grabFocus();
-  virtual jboolean isDoubleBuffered();
-  static jboolean isLightweightComponent(::java::awt::Component *);
-  virtual jboolean isManagingFocus();
-  virtual jboolean isOpaque();
-  virtual jboolean isOptimizedDrawingEnabled();
-  virtual jboolean isPaintingTile();
-  virtual jboolean isRequestFocusEnabled();
-  virtual jboolean isValidateRoot();
-  virtual void paint(::java::awt::Graphics *);
-private:
-  jboolean isOccupiedByChild(jint, jint, jint, jint);
-  void initializeDragBuffer();
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-  virtual void paintChildren(::java::awt::Graphics *);
-private:
-  jboolean isCompletelyObscured(jint, jint, jint, jint, jint);
-  jboolean isPartiallyObscured(jint, jint, jint, jint, jint);
-public: // actually protected
-  virtual void paintComponent(::java::awt::Graphics *);
-public:
-  virtual void paintImmediately(jint, jint, jint, jint);
-  virtual void paintImmediately(::java::awt::Rectangle *);
-public: // actually package-private
-  virtual void paintImmediately2(jint, jint, jint, jint);
-  virtual jboolean onTop();
-  virtual jboolean isPaintRoot();
-private:
-  void paintDoubleBuffered(jint, jint, jint, jint);
-  void clipAndTranslateGraphics(::java::awt::Component *, ::java::awt::Component *, ::java::awt::Graphics *);
-public: // actually package-private
-  virtual void paintSimple(::java::awt::Rectangle *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void registerKeyboardAction(::java::awt::event::ActionListener *, ::javax::swing::KeyStroke *, jint);
-  virtual void registerKeyboardAction(::java::awt::event::ActionListener *, ::java::lang::String *, ::javax::swing::KeyStroke *, jint);
-  virtual void setInputMap(jint, ::javax::swing::InputMap *);
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::InputMap * getInputMap();
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual void setActionMap(::javax::swing::ActionMap *);
-  virtual jint getConditionForKeyStroke(::javax::swing::KeyStroke *);
-  virtual ::java::awt::event::ActionListener * getActionForKeyStroke(::javax::swing::KeyStroke *);
-public: // actually protected
-  virtual void processComponentKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-  virtual jboolean processKeyBinding(::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
-public:
-  virtual void unregisterKeyboardAction(::javax::swing::KeyStroke *);
-  virtual void resetKeyboardActions();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void repaint(::java::awt::Rectangle *);
-  virtual jboolean requestDefaultFocus();
-  virtual void revalidate();
-  virtual void scrollRectToVisible(::java::awt::Rectangle *);
-  virtual void setAlignmentX(jfloat);
-  virtual void setAlignmentY(jfloat);
-  virtual void setAutoscrolls(jboolean);
-  virtual void setDebugGraphicsOptions(jint);
-  virtual void setDoubleBuffered(jboolean);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setNextFocusableComponent(::java::awt::Component *);
-  virtual void setRequestFocusEnabled(jboolean);
-  virtual ::javax::swing::TransferHandler * getTransferHandler();
-  virtual void setTransferHandler(::javax::swing::TransferHandler *);
-  virtual void setOpaque(jboolean);
-  virtual void setVisible(jboolean);
-  virtual void update(::java::awt::Graphics *);
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual void setUI(::javax::swing::plaf::ComponentUI *);
-public:
-  virtual void updateUI();
-  static ::java::util::Locale * getDefaultLocale();
-  static void setDefaultLocale(::java::util::Locale *);
-  virtual ::javax::swing::InputVerifier * getInputVerifier();
-  virtual void setInputVerifier(::javax::swing::InputVerifier *);
-  virtual jboolean getVerifyInputWhenFocusTarget();
-  virtual void setVerifyInputWhenFocusTarget(jboolean);
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-  virtual jboolean requestFocusInWindow();
-public: // actually protected
-  virtual jboolean requestFocusInWindow(jboolean);
-public:
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual jboolean contains(jint, jint);
-  virtual void disable();
-  virtual void enable();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jint getX();
-  virtual jint getY();
-  virtual jint getHeight();
-  virtual jint getWidth();
-  virtual void print(::java::awt::Graphics *);
-  virtual void printAll(::java::awt::Graphics *);
-public: // actually protected
-  virtual void printComponent(::java::awt::Graphics *);
-  virtual void printChildren(::java::awt::Graphics *);
-  virtual void printBorder(::java::awt::Graphics *);
-  virtual void processMouseMotionEvent(::java::awt::event::MouseEvent *);
-public:
-  virtual void reshape(jint, jint, jint, jint);
-public: // actually package-private
-  virtual void fireAncestorEvent(::javax::swing::JComponent *, jint);
-  virtual void updateComponentInputMap(::javax::swing::ComponentInputMap *);
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -7908749299918704233LL;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Container)))) accessibleContext;
-public: // actually package-private
-  jfloat alignmentX;
-  jfloat alignmentY;
-  ::javax::swing::border::Border * border;
-  ::javax::swing::JPopupMenu * componentPopupMenu;
-  jboolean inheritsPopupMenu;
-  jboolean doubleBuffered;
-  jint debugGraphicsOptions;
-  jboolean opaque;
-public: // actually protected
-  ::javax::swing::plaf::ComponentUI * ui;
-public: // actually package-private
-  jboolean requestFocusEnabled;
-  jboolean autoscrolls;
-  static jboolean paintingDoubleBuffered;
-  static jboolean isRepainting;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  ::java::beans::VetoableChangeSupport * vetoableChangeSupport;
-  ::java::util::Hashtable * clientProperties;
-  ::javax::swing::InputMap * inputMap_whenFocused;
-  ::javax::swing::InputMap * inputMap_whenAncestorOfFocused;
-  ::javax::swing::ComponentInputMap * inputMap_whenInFocusedWindow;
-  ::javax::swing::ActionMap * actionMap;
-  jboolean verifyInputWhenFocusTarget;
-  ::javax::swing::InputVerifier * inputVerifier;
-  ::javax::swing::TransferHandler * transferHandler;
-  jboolean paintingTile;
-  ::java::awt::Image * dragBuffer;
-  jboolean dragBufferInitialized;
-  static ::java::awt::Rectangle * rectCache;
-  static ::java::util::Locale * defaultLocale;
-public:
-  static ::java::lang::String * TOOL_TIP_TEXT_KEY;
-  static const jint UNDEFINED_CONDITION = -1;
-  static const jint WHEN_FOCUSED = 0;
-  static const jint WHEN_ANCESTOR_OF_FOCUSED_COMPONENT = 1;
-  static const jint WHEN_IN_FOCUSED_WINDOW = 2;
-public: // actually package-private
-  ::java::awt::Component * paintChild;
-private:
-  jboolean clientOpaqueSet;
-  jboolean clientAutoscrollsSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent__
diff --git a/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h b/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h
deleted file mode 100644
index 7788b49dda8..00000000000
--- a/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JDesktopPane$AccessibleJDesktopPane__
-#define __javax_swing_JDesktopPane$AccessibleJDesktopPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JDesktopPane;
-        class JDesktopPane$AccessibleJDesktopPane;
-    }
-  }
-}
-
-class javax::swing::JDesktopPane$AccessibleJDesktopPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JDesktopPane$AccessibleJDesktopPane(::javax::swing::JDesktopPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 6079388927946077570LL;
-public: // actually package-private
-  ::javax::swing::JDesktopPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JDesktopPane$AccessibleJDesktopPane__
diff --git a/libjava/javax/swing/JDesktopPane.h b/libjava/javax/swing/JDesktopPane.h
deleted file mode 100644
index d7e022c9065..00000000000
--- a/libjava/javax/swing/JDesktopPane.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JDesktopPane__
-#define __javax_swing_JDesktopPane__
-
-#pragma interface
-
-#include <javax/swing/JLayeredPane.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class DesktopManager;
-        class JDesktopPane;
-        class JInternalFrame;
-      namespace plaf
-      {
-          class DesktopPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JDesktopPane : public ::javax::swing::JLayeredPane
-{
-
-public:
-  JDesktopPane();
-  virtual ::javax::swing::plaf::DesktopPaneUI * getUI();
-  virtual void setUI(::javax::swing::plaf::DesktopPaneUI *);
-  virtual void setDragMode(jint);
-  virtual jint getDragMode();
-  virtual ::javax::swing::DesktopManager * getDesktopManager();
-  virtual void setDesktopManager(::javax::swing::DesktopManager *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual JArray< ::javax::swing::JInternalFrame * > * getAllFrames();
-  virtual ::javax::swing::JInternalFrame * getSelectedFrame();
-  virtual void setSelectedFrame(::javax::swing::JInternalFrame *);
-  virtual JArray< ::javax::swing::JInternalFrame * > * getAllFramesInLayer(jint);
-  virtual jboolean isOpaque();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  static JArray< ::javax::swing::JInternalFrame * > * getFramesFromComponents(JArray< ::java::awt::Component * > *);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 766333777224038726LL;
-public:
-  static const jint LIVE_DRAG_MODE = 0;
-  static const jint OUTLINE_DRAG_MODE = 1;
-private:
-  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JLayeredPane)))) selectedFrame;
-public: // actually package-private
-  ::javax::swing::DesktopManager * desktopManager;
-private:
-  jint dragMode;
-  jboolean clientDragModeSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JDesktopPane__
diff --git a/libjava/javax/swing/JDialog$AccessibleJDialog.h b/libjava/javax/swing/JDialog$AccessibleJDialog.h
deleted file mode 100644
index 26ffba493e1..00000000000
--- a/libjava/javax/swing/JDialog$AccessibleJDialog.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JDialog$AccessibleJDialog__
-#define __javax_swing_JDialog$AccessibleJDialog__
-
-#pragma interface
-
-#include <java/awt/Dialog$AccessibleAWTDialog.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JDialog;
-        class JDialog$AccessibleJDialog;
-    }
-  }
-}
-
-class javax::swing::JDialog$AccessibleJDialog : public ::java::awt::Dialog$AccessibleAWTDialog
-{
-
-public: // actually protected
-  JDialog$AccessibleJDialog(::javax::swing::JDialog *);
-public: // actually package-private
-  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::awt::Dialog$AccessibleAWTDialog)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JDialog$AccessibleJDialog__
diff --git a/libjava/javax/swing/JDialog.h b/libjava/javax/swing/JDialog.h
deleted file mode 100644
index 968a0fcba57..00000000000
--- a/libjava/javax/swing/JDialog.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JDialog__
-#define __javax_swing_JDialog__
-
-#pragma interface
-
-#include <java/awt/Dialog.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dialog;
-        class Dimension;
-        class Frame;
-        class Graphics;
-        class GraphicsConfiguration;
-        class LayoutManager;
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JDialog;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-    }
-  }
-}
-
-class javax::swing::JDialog : public ::java::awt::Dialog
-{
-
-public:
-  JDialog();
-  JDialog(::java::awt::Dialog *);
-  JDialog(::java::awt::Dialog *, jboolean);
-  JDialog(::java::awt::Dialog *, ::java::lang::String *);
-  JDialog(::java::awt::Dialog *, ::java::lang::String *, jboolean);
-  JDialog(::java::awt::Dialog *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
-  JDialog(::java::awt::Frame *);
-  JDialog(::java::awt::Frame *, jboolean);
-  JDialog(::java::awt::Frame *, ::java::lang::String *);
-  JDialog(::java::awt::Frame *, ::java::lang::String *, jboolean);
-  JDialog(::java::awt::Frame *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
-public: // actually protected
-  virtual void dialogInit();
-public:
-  static jboolean isDefaultLookAndFeelDecorated();
-  static void setDefaultLookAndFeelDecorated(jboolean);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JRootPane * getRootPane();
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void remove(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void update(::java::awt::Graphics *);
-public: // actually protected
-  virtual void processWindowEvent(::java::awt::event::WindowEvent *);
-public:
-  virtual void setDefaultCloseOperation(jint);
-  virtual jint getDefaultCloseOperation();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -864070866424508218LL;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Dialog)))) accessibleContext;
-  ::javax::swing::JRootPane * rootPane;
-  jboolean rootPaneCheckingEnabled;
-private:
-  jint closeAction;
-  static jboolean decorated;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JDialog__
diff --git a/libjava/javax/swing/JEditorPane$1.h b/libjava/javax/swing/JEditorPane$1.h
deleted file mode 100644
index 9eb8b8ae0a8..00000000000
--- a/libjava/javax/swing/JEditorPane$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$1__
-#define __javax_swing_JEditorPane$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$1;
-        class JEditorPane$PlainEditorKit;
-      namespace text
-      {
-          class Element;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JEditorPane$1(::javax::swing::JEditorPane$PlainEditorKit *);
-public:
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-public: // actually package-private
-  ::javax::swing::JEditorPane$PlainEditorKit * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$1__
diff --git a/libjava/javax/swing/JEditorPane$2.h b/libjava/javax/swing/JEditorPane$2.h
deleted file mode 100644
index ded4334c630..00000000000
--- a/libjava/javax/swing/JEditorPane$2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$2__
-#define __javax_swing_JEditorPane$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$2;
-        class JEditorPane$PageLoader;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JEditorPane$2(::javax::swing::JEditorPane$PageLoader *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::swing::JEditorPane$PageLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$2__
diff --git a/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h b/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h
deleted file mode 100644
index 9aecb469f25..00000000000
--- a/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$AccessibleJEditorPane__
-#define __javax_swing_JEditorPane$AccessibleJEditorPane__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$AccessibleJEditorPane;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$AccessibleJEditorPane : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
-{
-
-public: // actually protected
-  JEditorPane$AccessibleJEditorPane(::javax::swing::JEditorPane *);
-public:
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-public: // actually package-private
-  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$AccessibleJEditorPane__
diff --git a/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h b/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h
deleted file mode 100644
index b9ce1d57da4..00000000000
--- a/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
-#define __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
-
-#pragma interface
-
-#include <javax/swing/JEditorPane$AccessibleJEditorPane.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleText;
-    }
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$AccessibleJEditorPaneHTML;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$AccessibleJEditorPaneHTML : public ::javax::swing::JEditorPane$AccessibleJEditorPane
-{
-
-public: // actually protected
-  JEditorPane$AccessibleJEditorPaneHTML(::javax::swing::JEditorPane *);
-public:
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-public: // actually package-private
-  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::JEditorPane$AccessibleJEditorPane)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
diff --git a/libjava/javax/swing/JEditorPane$EditorKitMapping.h b/libjava/javax/swing/JEditorPane$EditorKitMapping.h
deleted file mode 100644
index cb9fa757ae3..00000000000
--- a/libjava/javax/swing/JEditorPane$EditorKitMapping.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$EditorKitMapping__
-#define __javax_swing_JEditorPane$EditorKitMapping__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$EditorKitMapping;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$EditorKitMapping : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JEditorPane$EditorKitMapping(::java::lang::String *, ::java::lang::ClassLoader *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) className;
-  ::java::lang::ClassLoader * classLoader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$EditorKitMapping__
diff --git a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h b/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h
deleted file mode 100644
index 3fd5224fe8a..00000000000
--- a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
-#define __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleHyperlink.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$JEditorPaneAccessibleHypertextSupport;
-        class JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink;
-      namespace text
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink : public ::javax::accessibility::AccessibleHyperlink
-{
-
-public:
-  JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink(::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport *, ::javax::swing::text::Element *);
-  virtual jboolean isValid();
-  virtual jint getAccessibleActionCount();
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual ::java::lang::Object * getAccessibleActionObject(jint);
-  virtual ::java::lang::Object * getAccessibleActionAnchor(jint);
-  virtual jint getStartIndex();
-  virtual jint getEndIndex();
-public: // actually package-private
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleHyperlink)))) element;
-  ::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
diff --git a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h b/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h
deleted file mode 100644
index 759b435f4f5..00000000000
--- a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
-#define __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
-
-#pragma interface
-
-#include <javax/swing/JEditorPane$AccessibleJEditorPane.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleHyperlink;
-    }
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$JEditorPaneAccessibleHypertextSupport;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport : public ::javax::swing::JEditorPane$AccessibleJEditorPane
-{
-
-public:
-  JEditorPane$JEditorPaneAccessibleHypertextSupport(::javax::swing::JEditorPane *);
-  virtual jint getLinkCount();
-  virtual ::javax::accessibility::AccessibleHyperlink * getLink(jint);
-  virtual jint getLinkIndex(jint);
-  virtual ::java::lang::String * getLinkText(jint);
-public: // actually package-private
-  static ::javax::swing::JEditorPane * access$0(::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport *);
-  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::JEditorPane$AccessibleJEditorPane)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
diff --git a/libjava/javax/swing/JEditorPane$PageLoader.h b/libjava/javax/swing/JEditorPane$PageLoader.h
deleted file mode 100644
index 6357e72a54d..00000000000
--- a/libjava/javax/swing/JEditorPane$PageLoader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$PageLoader__
-#define __javax_swing_JEditorPane$PageLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$PageLoader;
-        class JEditorPane$PageStream;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane$PageLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JEditorPane$PageLoader(::javax::swing::JEditorPane *, ::javax::swing::text::Document *, ::java::io::InputStream *, ::java::net::URL *, ::java::net::URL *);
-public:
-  virtual void run();
-public: // actually package-private
-  virtual void cancel();
-  static ::java::net::URL * access$0(::javax::swing::JEditorPane$PageLoader *);
-  static ::javax::swing::JEditorPane * access$1(::javax::swing::JEditorPane$PageLoader *);
-private:
-  ::javax::swing::text::Document * __attribute__((aligned(__alignof__( ::java::lang::Object)))) doc;
-  ::javax::swing::JEditorPane$PageStream * in;
-  ::java::net::URL * old;
-public: // actually package-private
-  ::java::net::URL * page;
-  ::javax::swing::JEditorPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$PageLoader__
diff --git a/libjava/javax/swing/JEditorPane$PageStream.h b/libjava/javax/swing/JEditorPane$PageStream.h
deleted file mode 100644
index b4591b722e1..00000000000
--- a/libjava/javax/swing/JEditorPane$PageStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$PageStream__
-#define __javax_swing_JEditorPane$PageStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$PageStream;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$PageStream : public ::java::io::FilterInputStream
-{
-
-public: // actually protected
-  JEditorPane$PageStream(::javax::swing::JEditorPane *, ::java::io::InputStream *);
-private:
-  void checkCancelled();
-public: // actually package-private
-  virtual void cancel();
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-  virtual jint available();
-  virtual void reset();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) cancelled;
-public: // actually package-private
-  ::javax::swing::JEditorPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$PageStream__
diff --git a/libjava/javax/swing/JEditorPane$PlainEditorKit.h b/libjava/javax/swing/JEditorPane$PlainEditorKit.h
deleted file mode 100644
index 39ca0d31834..00000000000
--- a/libjava/javax/swing/JEditorPane$PlainEditorKit.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$PlainEditorKit__
-#define __javax_swing_JEditorPane$PlainEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultEditorKit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$PlainEditorKit;
-      namespace text
-      {
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane$PlainEditorKit : public ::javax::swing::text::DefaultEditorKit
-{
-
-  JEditorPane$PlainEditorKit();
-public:
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-public: // actually package-private
-  JEditorPane$PlainEditorKit(::javax::swing::JEditorPane$PlainEditorKit *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$PlainEditorKit__
diff --git a/libjava/javax/swing/JEditorPane.h b/libjava/javax/swing/JEditorPane.h
deleted file mode 100644
index 0d1404cee8c..00000000000
--- a/libjava/javax/swing/JEditorPane.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane__
-#define __javax_swing_JEditorPane__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$PageLoader;
-      namespace event
-      {
-          class HyperlinkEvent;
-          class HyperlinkListener;
-      }
-      namespace text
-      {
-          class EditorKit;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane : public ::javax::swing::text::JTextComponent
-{
-
-public:
-  JEditorPane();
-  JEditorPane(::java::lang::String *);
-  JEditorPane(::java::lang::String *, ::java::lang::String *);
-  JEditorPane(::java::net::URL *);
-public: // actually package-private
-  virtual void init();
-public: // actually protected
-  virtual ::javax::swing::text::EditorKit * createDefaultEditorKit();
-public:
-  static ::javax::swing::text::EditorKit * createEditorKitForContentType(::java::lang::String *);
-  virtual void fireHyperlinkUpdate(::javax::swing::event::HyperlinkEvent *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getContentType();
-  virtual ::javax::swing::text::EditorKit * getEditorKit();
-  static ::java::lang::String * getEditorKitClassNameForContentType(::java::lang::String *);
-  virtual ::javax::swing::text::EditorKit * getEditorKitForContentType(::java::lang::String *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual ::java::net::URL * getPage();
-public: // actually protected
-  virtual ::java::io::InputStream * getStream(::java::net::URL *);
-public:
-  virtual ::java::lang::String * getText();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean isFocusCycleRoot();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void read(::java::io::InputStream *, ::java::lang::Object *);
-  static void registerEditorKitForContentType(::java::lang::String *, ::java::lang::String *);
-  static void registerEditorKitForContentType(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  virtual void replaceSelection(::java::lang::String *);
-  virtual void scrollToReference(::java::lang::String *);
-  virtual void setContentType(::java::lang::String *);
-  virtual void setEditorKit(::javax::swing::text::EditorKit *);
-  virtual void setEditorKitForContentType(::java::lang::String *, ::javax::swing::text::EditorKit *);
-  virtual void setPage(::java::lang::String *);
-  virtual void setPage(::java::net::URL *);
-  virtual void setText(::java::lang::String *);
-  virtual void addHyperlinkListener(::javax::swing::event::HyperlinkListener *);
-  virtual void removeHyperlinkListener(::javax::swing::event::HyperlinkListener *);
-  virtual JArray< ::javax::swing::event::HyperlinkListener * > * getHyperlinkListeners();
-public: // actually package-private
-  static void access$0(::javax::swing::JEditorPane *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 3140472492599046285LL;
-  ::javax::swing::text::EditorKit * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) editorKit;
-public: // actually package-private
-  jboolean focus_root;
-  static ::java::util::HashMap * editorKits;
-  static ::java::util::HashMap * registerMap;
-  ::java::util::HashMap * editorMap;
-private:
-  ::javax::swing::JEditorPane$PageLoader * loader;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane__
diff --git a/libjava/javax/swing/JFileChooser$1.h b/libjava/javax/swing/JFileChooser$1.h
deleted file mode 100644
index 87b504532c7..00000000000
--- a/libjava/javax/swing/JFileChooser$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFileChooser$1__
-#define __javax_swing_JFileChooser$1__
-
-#pragma interface
-
-#include <java/awt/event/WindowAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-        class JFileChooser$1;
-    }
-  }
-}
-
-class javax::swing::JFileChooser$1 : public ::java::awt::event::WindowAdapter
-{
-
-public: // actually package-private
-  JFileChooser$1(::javax::swing::JFileChooser *);
-public:
-  virtual void windowClosing(::java::awt::event::WindowEvent *);
-public: // actually package-private
-  ::javax::swing::JFileChooser * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFileChooser$1__
diff --git a/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h b/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h
deleted file mode 100644
index 6229b49b62c..00000000000
--- a/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFileChooser$AccessibleJFileChooser__
-#define __javax_swing_JFileChooser$AccessibleJFileChooser__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JFileChooser;
-        class JFileChooser$AccessibleJFileChooser;
-    }
-  }
-}
-
-class javax::swing::JFileChooser$AccessibleJFileChooser : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JFileChooser$AccessibleJFileChooser(::javax::swing::JFileChooser *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JFileChooser * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFileChooser$AccessibleJFileChooser__
diff --git a/libjava/javax/swing/JFileChooser.h b/libjava/javax/swing/JFileChooser.h
deleted file mode 100644
index d9418e25228..00000000000
--- a/libjava/javax/swing/JFileChooser.h
+++ /dev/null
@@ -1,197 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFileChooser__
-#define __javax_swing_JFileChooser__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JDialog;
-        class JFileChooser;
-      namespace filechooser
-      {
-          class FileFilter;
-          class FileSystemView;
-          class FileView;
-      }
-      namespace plaf
-      {
-          class FileChooserUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JFileChooser : public ::javax::swing::JComponent
-{
-
-public:
-  JFileChooser();
-  JFileChooser(::java::lang::String *);
-  JFileChooser(::java::lang::String *, ::javax::swing::filechooser::FileSystemView *);
-  JFileChooser(::java::io::File *);
-  JFileChooser(::javax::swing::filechooser::FileSystemView *);
-  JFileChooser(::java::io::File *, ::javax::swing::filechooser::FileSystemView *);
-public: // actually protected
-  virtual void setup(::javax::swing::filechooser::FileSystemView *);
-public:
-  virtual void setDragEnabled(jboolean);
-  virtual jboolean getDragEnabled();
-  virtual ::java::io::File * getSelectedFile();
-  virtual void setSelectedFile(::java::io::File *);
-  virtual JArray< ::java::io::File * > * getSelectedFiles();
-  virtual void setSelectedFiles(JArray< ::java::io::File * > *);
-  virtual ::java::io::File * getCurrentDirectory();
-  virtual void setCurrentDirectory(::java::io::File *);
-  virtual void changeToParentDirectory();
-  virtual void rescanCurrentDirectory();
-  virtual void ensureFileIsVisible(::java::io::File *);
-  virtual jint showOpenDialog(::java::awt::Component *);
-  virtual jint showSaveDialog(::java::awt::Component *);
-  virtual jint showDialog(::java::awt::Component *, ::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::JDialog * createDialog(::java::awt::Component *);
-public:
-  virtual jboolean getControlButtonsAreShown();
-  virtual void setControlButtonsAreShown(jboolean);
-  virtual jint getDialogType();
-  virtual void setDialogType(jint);
-  virtual void setDialogTitle(::java::lang::String *);
-  virtual ::java::lang::String * getDialogTitle();
-  virtual void setApproveButtonToolTipText(::java::lang::String *);
-  virtual ::java::lang::String * getApproveButtonToolTipText();
-  virtual jint getApproveButtonMnemonic();
-  virtual void setApproveButtonMnemonic(jint);
-  virtual void setApproveButtonMnemonic(jchar);
-  virtual void setApproveButtonText(::java::lang::String *);
-  virtual ::java::lang::String * getApproveButtonText();
-  virtual JArray< ::javax::swing::filechooser::FileFilter * > * getChoosableFileFilters();
-  virtual void addChoosableFileFilter(::javax::swing::filechooser::FileFilter *);
-  virtual jboolean removeChoosableFileFilter(::javax::swing::filechooser::FileFilter *);
-  virtual void resetChoosableFileFilters();
-  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter();
-  virtual jboolean isAcceptAllFileFilterUsed();
-  virtual void setAcceptAllFileFilterUsed(jboolean);
-  virtual ::javax::swing::JComponent * getAccessory();
-  virtual void setAccessory(::javax::swing::JComponent *);
-  virtual void setFileSelectionMode(jint);
-  virtual jint getFileSelectionMode();
-  virtual jboolean isFileSelectionEnabled();
-  virtual jboolean isDirectorySelectionEnabled();
-  virtual void setMultiSelectionEnabled(jboolean);
-  virtual jboolean isMultiSelectionEnabled();
-  virtual jboolean isFileHidingEnabled();
-  virtual void setFileHidingEnabled(jboolean);
-  virtual void setFileFilter(::javax::swing::filechooser::FileFilter *);
-  virtual ::javax::swing::filechooser::FileFilter * getFileFilter();
-  virtual void setFileView(::javax::swing::filechooser::FileView *);
-  virtual ::javax::swing::filechooser::FileView * getFileView();
-  virtual ::java::lang::String * getName(::java::io::File *);
-  virtual ::java::lang::String * getDescription(::java::io::File *);
-  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
-  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
-  virtual jboolean isTraversable(::java::io::File *);
-  virtual jboolean accept(::java::io::File *);
-  virtual void setFileSystemView(::javax::swing::filechooser::FileSystemView *);
-  virtual ::javax::swing::filechooser::FileSystemView * getFileSystemView();
-  virtual void approveSelection();
-  virtual void cancelSelection();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-public: // actually protected
-  virtual void fireActionPerformed(::java::lang::String *);
-public:
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::plaf::FileChooserUI * getUI();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 3162921138695327837LL;
-public:
-  static const jint OPEN_DIALOG = 0;
-  static const jint SAVE_DIALOG = 1;
-  static const jint CUSTOM_DIALOG = 2;
-  static const jint CANCEL_OPTION = 1;
-  static const jint APPROVE_OPTION = 0;
-  static const jint ERROR_OPTION = -1;
-  static const jint FILES_ONLY = 0;
-  static const jint DIRECTORIES_ONLY = 1;
-  static const jint FILES_AND_DIRECTORIES = 2;
-  static ::java::lang::String * CANCEL_SELECTION;
-  static ::java::lang::String * APPROVE_SELECTION;
-  static ::java::lang::String * APPROVE_BUTTON_TEXT_CHANGED_PROPERTY;
-  static ::java::lang::String * APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY;
-  static ::java::lang::String * APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY;
-  static ::java::lang::String * CONTROL_BUTTONS_ARE_SHOWN_CHANGED_PROPERTY;
-  static ::java::lang::String * DIRECTORY_CHANGED_PROPERTY;
-  static ::java::lang::String * SELECTED_FILE_CHANGED_PROPERTY;
-  static ::java::lang::String * SELECTED_FILES_CHANGED_PROPERTY;
-  static ::java::lang::String * MULTI_SELECTION_ENABLED_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_SYSTEM_VIEW_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_VIEW_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_HIDING_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_FILTER_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_SELECTION_MODE_CHANGED_PROPERTY;
-  static ::java::lang::String * ACCESSORY_CHANGED_PROPERTY;
-  static ::java::lang::String * ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY;
-  static ::java::lang::String * DIALOG_TITLE_CHANGED_PROPERTY;
-  static ::java::lang::String * DIALOG_TYPE_CHANGED_PROPERTY;
-  static ::java::lang::String * CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) accessibleContext;
-private:
-  ::javax::swing::filechooser::FileSystemView * fsv;
-  ::javax::swing::JComponent * accessory;
-  jint approveButtonMnemonic;
-  ::java::lang::String * approveButtonText;
-  ::java::lang::String * approveButtonToolTipText;
-  ::java::util::ArrayList * choosableFilters;
-  jboolean isAcceptAll;
-  ::java::lang::String * dialogTitle;
-  jint dialogType;
-  jint retval;
-  jboolean multiSelection;
-  jboolean fileHiding;
-  jint fileSelectionMode;
-  ::javax::swing::filechooser::FileView * fv;
-  jboolean controlButtonsShown;
-  ::java::io::File * currentDir;
-  ::javax::swing::filechooser::FileFilter * currentFilter;
-  JArray< ::java::io::File * > * selectedFiles;
-  ::java::io::File * selectedFile;
-  jboolean dragEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFileChooser__
diff --git a/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h b/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h
deleted file mode 100644
index d7ef6b51f24..00000000000
--- a/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFormattedTextField$AbstractFormatter__
-#define __javax_swing_JFormattedTextField$AbstractFormatter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JFormattedTextField;
-        class JFormattedTextField$AbstractFormatter;
-      namespace text
-      {
-          class DocumentFilter;
-          class NavigationFilter;
-      }
-    }
-  }
-}
-
-class javax::swing::JFormattedTextField$AbstractFormatter : public ::java::lang::Object
-{
-
-public:
-  JFormattedTextField$AbstractFormatter();
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
-  virtual ::javax::swing::JFormattedTextField * getFormattedTextField();
-  virtual ::javax::swing::text::NavigationFilter * getNavigationFilter();
-public:
-  virtual void install(::javax::swing::JFormattedTextField *);
-  virtual void uninstall();
-public: // actually protected
-  virtual void invalidEdit();
-  virtual void setEditValid(jboolean);
-public:
-  virtual ::java::lang::Object * stringToValue(::java::lang::String *) = 0;
-  virtual ::java::lang::String * valueToString(::java::lang::Object *) = 0;
-private:
-  static const jlong serialVersionUID = -5193212041738979680LL;
-  ::javax::swing::JFormattedTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) textField;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFormattedTextField$AbstractFormatter__
diff --git a/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h b/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h
deleted file mode 100644
index 45c633db4e4..00000000000
--- a/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFormattedTextField$AbstractFormatterFactory__
-#define __javax_swing_JFormattedTextField$AbstractFormatterFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-        class JFormattedTextField$AbstractFormatter;
-        class JFormattedTextField$AbstractFormatterFactory;
-    }
-  }
-}
-
-class javax::swing::JFormattedTextField$AbstractFormatterFactory : public ::java::lang::Object
-{
-
-public:
-  JFormattedTextField$AbstractFormatterFactory();
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter(::javax::swing::JFormattedTextField *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFormattedTextField$AbstractFormatterFactory__
diff --git a/libjava/javax/swing/JFormattedTextField.h b/libjava/javax/swing/JFormattedTextField.h
deleted file mode 100644
index 5c79e06e605..00000000000
--- a/libjava/javax/swing/JFormattedTextField.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFormattedTextField__
-#define __javax_swing_JFormattedTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-    namespace text
-    {
-        class Format;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JFormattedTextField;
-        class JFormattedTextField$AbstractFormatter;
-        class JFormattedTextField$AbstractFormatterFactory;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JFormattedTextField : public ::javax::swing::JTextField
-{
-
-public:
-  JFormattedTextField();
-  JFormattedTextField(::java::text::Format *);
-  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatterFactory *);
-  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatterFactory *, ::java::lang::Object *);
-  JFormattedTextField(::java::lang::Object *);
-private:
-  ::javax::swing::JFormattedTextField$AbstractFormatterFactory * getAppropriateFormatterFactory(::java::text::Format *);
-public:
-  virtual void commitEdit();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual jint getFocusLostBehavior();
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter();
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatterFactory * getFormatterFactory();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::lang::Object * getValue();
-public: // actually protected
-  virtual void invalidEdit();
-public:
-  virtual jboolean isEditValid();
-public: // actually protected
-  virtual void processFocusEvent(::java::awt::event::FocusEvent *);
-public:
-  virtual void setDocument(::javax::swing::text::Document *);
-  virtual void setFocusLostBehavior(jint);
-public: // actually protected
-  virtual void setFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-public:
-  virtual void setFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatterFactory *);
-  virtual void setValue(::java::lang::Object *);
-public: // actually package-private
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatterFactory * createFormatterFactory(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 5464657870110180632LL;
-public:
-  static const jint COMMIT = 0;
-  static const jint COMMIT_OR_REVERT = 1;
-  static const jint REVERT = 2;
-  static const jint PERSIST = 3;
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) value;
-  jint focusLostBehavior;
-  ::javax::swing::JFormattedTextField$AbstractFormatterFactory * formatterFactory;
-  ::javax::swing::JFormattedTextField$AbstractFormatter * formatter;
-public: // actually package-private
-  jboolean editValid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFormattedTextField__
diff --git a/libjava/javax/swing/JFrame$AccessibleJFrame.h b/libjava/javax/swing/JFrame$AccessibleJFrame.h
deleted file mode 100644
index dbb3c553faa..00000000000
--- a/libjava/javax/swing/JFrame$AccessibleJFrame.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFrame$AccessibleJFrame__
-#define __javax_swing_JFrame$AccessibleJFrame__
-
-#pragma interface
-
-#include <java/awt/Frame$AccessibleAWTFrame.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFrame;
-        class JFrame$AccessibleJFrame;
-    }
-  }
-}
-
-class javax::swing::JFrame$AccessibleJFrame : public ::java::awt::Frame$AccessibleAWTFrame
-{
-
-public: // actually protected
-  JFrame$AccessibleJFrame(::javax::swing::JFrame *);
-public: // actually package-private
-  ::javax::swing::JFrame * __attribute__((aligned(__alignof__( ::java::awt::Frame$AccessibleAWTFrame)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFrame$AccessibleJFrame__
diff --git a/libjava/javax/swing/JFrame.h b/libjava/javax/swing/JFrame.h
deleted file mode 100644
index 705e200b2f9..00000000000
--- a/libjava/javax/swing/JFrame.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFrame__
-#define __javax_swing_JFrame__
-
-#pragma interface
-
-#include <java/awt/Frame.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Graphics;
-        class GraphicsConfiguration;
-        class LayoutManager;
-      namespace event
-      {
-          class KeyEvent;
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JFrame;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-    }
-  }
-}
-
-class javax::swing::JFrame : public ::java::awt::Frame
-{
-
-public:
-  JFrame();
-  JFrame(::java::lang::String *);
-  JFrame(::java::awt::GraphicsConfiguration *);
-  JFrame(::java::lang::String *, ::java::awt::GraphicsConfiguration *);
-public: // actually protected
-  virtual void frameInit();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JRootPane * getRootPane();
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void remove(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void update(::java::awt::Graphics *);
-public: // actually protected
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  static void setDefaultLookAndFeelDecorated(jboolean);
-  static jboolean isDefaultLookAndFeelDecorated();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual jint getDefaultCloseOperation();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-  virtual void processWindowEvent(::java::awt::event::WindowEvent *);
-public:
-  virtual void setDefaultCloseOperation(jint);
-  static const jint EXIT_ON_CLOSE = 3;
-private:
-  static const jlong serialVersionUID = -3362141868504252139LL;
-  static jboolean defaultLookAndFeelDecorated;
-  jint __attribute__((aligned(__alignof__( ::java::awt::Frame)))) closeAction;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-  ::javax::swing::JRootPane * rootPane;
-  jboolean rootPaneCheckingEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFrame__
diff --git a/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h b/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h
deleted file mode 100644
index 94749ac5a50..00000000000
--- a/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JInternalFrame$AccessibleJInternalFrame__
-#define __javax_swing_JInternalFrame$AccessibleJInternalFrame__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JInternalFrame;
-        class JInternalFrame$AccessibleJInternalFrame;
-    }
-  }
-}
-
-class javax::swing::JInternalFrame$AccessibleJInternalFrame : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JInternalFrame$AccessibleJInternalFrame(::javax::swing::JInternalFrame *);
-public:
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-private:
-  static const jlong serialVersionUID = 5931936924175476797LL;
-public: // actually package-private
-  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JInternalFrame$AccessibleJInternalFrame__
diff --git a/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h b/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h
deleted file mode 100644
index bcea0c5139f..00000000000
--- a/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
-#define __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JInternalFrame$JDesktopIcon;
-        class JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon;
-    }
-  }
-}
-
-class javax::swing::JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon(::javax::swing::JInternalFrame$JDesktopIcon *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-private:
-  static const jlong serialVersionUID = 5035560458941637802LL;
-public: // actually package-private
-  ::javax::swing::JInternalFrame$JDesktopIcon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
diff --git a/libjava/javax/swing/JInternalFrame$JDesktopIcon.h b/libjava/javax/swing/JInternalFrame$JDesktopIcon.h
deleted file mode 100644
index dc20f4d5781..00000000000
--- a/libjava/javax/swing/JInternalFrame$JDesktopIcon.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JInternalFrame$JDesktopIcon__
-#define __javax_swing_JInternalFrame$JDesktopIcon__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JDesktopPane;
-        class JInternalFrame;
-        class JInternalFrame$JDesktopIcon;
-      namespace plaf
-      {
-          class DesktopIconUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JInternalFrame$JDesktopIcon : public ::javax::swing::JComponent
-{
-
-public:
-  JInternalFrame$JDesktopIcon(::javax::swing::JInternalFrame *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::JDesktopPane * getDesktopPane();
-  virtual ::javax::swing::JInternalFrame * getInternalFrame();
-  virtual ::javax::swing::plaf::DesktopIconUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setInternalFrame(::javax::swing::JInternalFrame *);
-  virtual void setUI(::javax::swing::plaf::DesktopIconUI *);
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = 4672973344731387687LL;
-public: // actually package-private
-  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) frame;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JInternalFrame$JDesktopIcon__
diff --git a/libjava/javax/swing/JInternalFrame.h b/libjava/javax/swing/JInternalFrame.h
deleted file mode 100644
index 36deb84c55e..00000000000
--- a/libjava/javax/swing/JInternalFrame.h
+++ /dev/null
@@ -1,192 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JInternalFrame__
-#define __javax_swing_JInternalFrame__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class LayoutManager;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JDesktopPane;
-        class JInternalFrame;
-        class JInternalFrame$JDesktopIcon;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-      namespace event
-      {
-          class InternalFrameListener;
-      }
-      namespace plaf
-      {
-          class InternalFrameUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JInternalFrame : public ::javax::swing::JComponent
-{
-
-public:
-  JInternalFrame();
-  JInternalFrame(::java::lang::String *);
-  JInternalFrame(::java::lang::String *, jboolean);
-  JInternalFrame(::java::lang::String *, jboolean, jboolean);
-  JInternalFrame(::java::lang::String *, jboolean, jboolean, jboolean);
-  JInternalFrame(::java::lang::String *, jboolean, jboolean, jboolean, jboolean);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void addInternalFrameListener(::javax::swing::event::InternalFrameListener *);
-public: // actually protected
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual void dispose();
-  virtual void doDefaultCloseAction();
-public: // actually protected
-  virtual void fireInternalFrameEvent(jint);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Container * getContentPane();
-  virtual jint getDefaultCloseOperation();
-  virtual ::javax::swing::JInternalFrame$JDesktopIcon * getDesktopIcon();
-  virtual ::javax::swing::JDesktopPane * getDesktopPane();
-  virtual ::java::awt::Container * getFocusCycleRootAncestor();
-  virtual ::java::awt::Component * getFocusOwner();
-  virtual ::javax::swing::Icon * getFrameIcon();
-  virtual ::java::awt::Component * getGlassPane();
-  virtual JArray< ::javax::swing::event::InternalFrameListener * > * getInternalFrameListeners();
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual jint getLayer();
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JMenuBar * getMenuBar();
-  virtual ::java::awt::Component * getMostRecentFocusOwner();
-  virtual ::java::awt::Rectangle * getNormalBounds();
-  virtual ::javax::swing::JRootPane * getRootPane();
-  virtual ::java::lang::String * getTitle();
-  virtual ::javax::swing::plaf::InternalFrameUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::lang::String * getWarningString();
-  virtual void hide();
-  virtual jboolean isClosable();
-  virtual jboolean isClosed();
-  virtual jboolean isFocusCycleRoot();
-  virtual jboolean isIcon();
-  virtual jboolean isIconifiable();
-  virtual jboolean isMaximizable();
-  virtual jboolean isMaximum();
-  virtual jboolean isResizable();
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-public:
-  virtual jboolean isSelected();
-  virtual void moveToBack();
-  virtual void moveToFront();
-  virtual void pack();
-public: // actually protected
-  virtual void paintComponent(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void remove(::java::awt::Component *);
-  virtual void removeInternalFrameListener(::javax::swing::event::InternalFrameListener *);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void restoreSubcomponentFocus();
-  virtual void setClosable(jboolean);
-  virtual void setClosed(jboolean);
-  virtual void setContentPane(::java::awt::Container *);
-  virtual void setDefaultCloseOperation(jint);
-  virtual void setDesktopIcon(::javax::swing::JInternalFrame$JDesktopIcon *);
-  virtual void setFocusCycleRoot(jboolean);
-  virtual void setFrameIcon(::javax::swing::Icon *);
-  virtual void setGlassPane(::java::awt::Component *);
-  virtual void setIcon(jboolean);
-  virtual void setIconifiable(jboolean);
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-  virtual void setLayer(jint);
-  virtual void setLayer(::java::lang::Integer *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual void setMaximizable(jboolean);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setMaximum(jboolean);
-  virtual void setMenuBar(::javax::swing::JMenuBar *);
-  virtual void setNormalBounds(::java::awt::Rectangle *);
-  virtual void setResizable(jboolean);
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void setSelected(jboolean);
-  virtual void setTitle(::java::lang::String *);
-  virtual void show();
-  virtual void setUI(::javax::swing::plaf::InternalFrameUI *);
-  virtual void toBack();
-  virtual void toFront();
-  virtual void updateUI();
-public: // actually package-private
-  virtual void setWasIcon(jboolean, ::java::lang::String *);
-  virtual jboolean getWasIcon();
-private:
-  void fireVetoableChange(::java::lang::String *, jboolean, jboolean);
-  static const jlong serialVersionUID = -5425177187760785402LL;
-public:
-  static ::java::lang::String * CONTENT_PANE_PROPERTY;
-  static ::java::lang::String * FRAME_ICON_PROPERTY;
-  static ::java::lang::String * GLASS_PANE_PROPERTY;
-  static ::java::lang::String * IS_CLOSED_PROPERTY;
-  static ::java::lang::String * IS_ICON_PROPERTY;
-  static ::java::lang::String * IS_MAXIMUM_PROPERTY;
-  static ::java::lang::String * IS_SELECTED_PROPERTY;
-  static ::java::lang::String * LAYERED_PANE_PROPERTY;
-  static ::java::lang::String * MENU_BAR_PROPERTY;
-  static ::java::lang::String * ROOT_PANE_PROPERTY;
-  static ::java::lang::String * TITLE_PROPERTY;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) closable;
-  jboolean iconable;
-  jboolean isClosed__;
-  jboolean isIcon__;
-  jboolean isMaximum__;
-  jboolean isSelected__;
-  jboolean maximizable;
-  jboolean rootPaneCheckingEnabled;
-  jboolean resizable;
-  ::javax::swing::JInternalFrame$JDesktopIcon * desktopIcon;
-  ::javax::swing::Icon * frameIcon;
-  ::javax::swing::JRootPane * rootPane;
-  ::java::lang::String * title;
-private:
-  ::java::awt::Rectangle * storedBounds;
-  ::java::awt::Component * defaultFocus;
-  jint defaultCloseOperation;
-  jboolean isFirstTimeVisible;
-  jboolean wasIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JInternalFrame__
diff --git a/libjava/javax/swing/JLabel$AccessibleJLabel.h b/libjava/javax/swing/JLabel$AccessibleJLabel.h
deleted file mode 100644
index 0fb4609aa68..00000000000
--- a/libjava/javax/swing/JLabel$AccessibleJLabel.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JLabel$AccessibleJLabel__
-#define __javax_swing_JLabel$AccessibleJLabel__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JLabel;
-        class JLabel$AccessibleJLabel;
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::JLabel$AccessibleJLabel : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JLabel$AccessibleJLabel(::javax::swing::JLabel *);
-public:
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::java::lang::String * getSelectedText();
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
-  virtual ::java::lang::String * getAtIndex(jint, jint);
-  virtual ::java::lang::String * getAfterIndex(jint, jint);
-  virtual ::java::lang::String * getBeforeIndex(jint, jint);
-  virtual jint getCaretPosition();
-  virtual jint getCharCount();
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-private:
-  ::java::awt::Rectangle * getTextRectangle();
-public:
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-public: // actually package-private
-  ::javax::swing::JLabel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JLabel$AccessibleJLabel__
diff --git a/libjava/javax/swing/JLabel.h b/libjava/javax/swing/JLabel.h
deleted file mode 100644
index 08f59ed8f8c..00000000000
--- a/libjava/javax/swing/JLabel.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JLabel__
-#define __javax_swing_JLabel__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Font;
-        class Image;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JLabel;
-      namespace plaf
-      {
-          class LabelUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JLabel : public ::javax::swing::JComponent
-{
-
-public:
-  JLabel();
-  JLabel(::javax::swing::Icon *);
-  JLabel(::javax::swing::Icon *, jint);
-  JLabel(::java::lang::String *);
-  JLabel(::java::lang::String *, jint);
-  JLabel(::java::lang::String *, ::javax::swing::Icon *, jint);
-  virtual ::javax::swing::plaf::LabelUI * getUI();
-  virtual void setUI(::javax::swing::plaf::LabelUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual ::javax::swing::Icon * getIcon();
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getDisabledIcon();
-  virtual void setDisabledIcon(::javax::swing::Icon *);
-  virtual void setDisplayedMnemonic(jint);
-  virtual void setDisplayedMnemonic(jchar);
-  virtual jint getDisplayedMnemonic();
-  virtual void setDisplayedMnemonicIndex(jint);
-  virtual jint getDisplayedMnemonicIndex();
-public: // actually protected
-  virtual jint checkHorizontalKey(jint, ::java::lang::String *);
-  virtual jint checkVerticalKey(jint, ::java::lang::String *);
-public:
-  virtual jint getIconTextGap();
-  virtual void setIconTextGap(jint);
-  virtual jint getVerticalAlignment();
-  virtual void setVerticalAlignment(jint);
-  virtual jint getHorizontalAlignment();
-  virtual void setHorizontalAlignment(jint);
-  virtual jint getVerticalTextPosition();
-  virtual void setVerticalTextPosition(jint);
-  virtual jint getHorizontalTextPosition();
-  virtual void setHorizontalTextPosition(jint);
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Component * getLabelFor();
-  virtual void setLabelFor(::java::awt::Component *);
-  virtual void setFont(::java::awt::Font *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 5496508283662221534LL;
-public: // actually package-private
-  static ::java::lang::String * LABEL_PROPERTY;
-public: // actually protected
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) labelFor;
-public: // actually package-private
-  ::java::lang::String * text;
-private:
-  jint horizontalAlignment;
-  jint horizontalTextPosition;
-  jint verticalAlignment;
-  jint verticalTextPosition;
-  ::javax::swing::Icon * icon;
-  ::javax::swing::Icon * disabledIcon;
-  jint displayedMnemonic;
-  jint displayedMnemonicIndex;
-  jint iconTextGap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JLabel__
diff --git a/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h b/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h
deleted file mode 100644
index 64eaa6d8b3b..00000000000
--- a/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JLayeredPane$AccessibleJLayeredPane__
-#define __javax_swing_JLayeredPane$AccessibleJLayeredPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JLayeredPane;
-        class JLayeredPane$AccessibleJLayeredPane;
-    }
-  }
-}
-
-class javax::swing::JLayeredPane$AccessibleJLayeredPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JLayeredPane$AccessibleJLayeredPane(::javax::swing::JLayeredPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JLayeredPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JLayeredPane$AccessibleJLayeredPane__
diff --git a/libjava/javax/swing/JLayeredPane.h b/libjava/javax/swing/JLayeredPane.h
deleted file mode 100644
index 3e6acaa9248..00000000000
--- a/libjava/javax/swing/JLayeredPane.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JLayeredPane__
-#define __javax_swing_JLayeredPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JLayeredPane;
-    }
-  }
-}
-
-class javax::swing::JLayeredPane : public ::javax::swing::JComponent
-{
-
-public:
-  JLayeredPane();
-  virtual jint getLayer(::java::awt::Component *);
-  static jint getLayer(::javax::swing::JComponent *);
-  static ::javax::swing::JLayeredPane * getLayeredPaneAbove(::java::awt::Component *);
-  virtual jint highestLayer();
-  virtual jint lowestLayer();
-  virtual void moveToFront(::java::awt::Component *);
-  virtual void moveToBack(::java::awt::Component *);
-  virtual jint getPosition(::java::awt::Component *);
-  virtual void setPosition(::java::awt::Component *, jint);
-  virtual JArray< ::java::awt::Component * > * getComponentsInLayer(jint);
-  virtual jint getComponentCountInLayer(jint);
-public: // actually protected
-  virtual ::java::util::Hashtable * getComponentToLayer();
-public:
-  virtual jint getIndexOf(::java::awt::Component *);
-public: // actually protected
-  virtual ::java::lang::Integer * getObjectForLayer(jint);
-  virtual jint insertIndexForLayer(jint, jint);
-private:
-  jint insertIndexForLayer(::java::awt::Component *, jint, jint);
-public:
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual void setLayer(::java::awt::Component *, jint);
-  virtual void setLayer(::java::awt::Component *, jint, jint);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  static void putLayer(::javax::swing::JComponent *, jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void paint(::java::awt::Graphics *);
-  virtual jboolean isOptimizedDrawingEnabled();
-private:
-  static const jlong serialVersionUID = 5534920399324590459LL;
-public:
-  static ::java::lang::String * LAYER_PROPERTY;
-  static ::java::lang::Integer * FRAME_CONTENT_LAYER;
-  static ::java::lang::Integer * DEFAULT_LAYER;
-  static ::java::lang::Integer * PALETTE_LAYER;
-  static ::java::lang::Integer * MODAL_LAYER;
-  static ::java::lang::Integer * POPUP_LAYER;
-  static ::java::lang::Integer * DRAG_LAYER;
-private:
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) componentToLayer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JLayeredPane__
diff --git a/libjava/javax/swing/JList$1.h b/libjava/javax/swing/JList$1.h
deleted file mode 100644
index 8b665c7f835..00000000000
--- a/libjava/javax/swing/JList$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$1__
-#define __javax_swing_JList$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class JList$1;
-    }
-  }
-}
-
-class javax::swing::JList$1 : public ::javax::swing::AbstractListModel
-{
-
-public: // actually package-private
-  JList$1(::javax::swing::JList *, JArray< ::java::lang::Object * > *);
-public:
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
-private:
-  JArray< ::java::lang::Object * > * val$items;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$1__
diff --git a/libjava/javax/swing/JList$2.h b/libjava/javax/swing/JList$2.h
deleted file mode 100644
index bcb6fbc59f9..00000000000
--- a/libjava/javax/swing/JList$2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$2__
-#define __javax_swing_JList$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class JList$2;
-    }
-  }
-}
-
-class javax::swing::JList$2 : public ::javax::swing::AbstractListModel
-{
-
-public: // actually package-private
-  JList$2(::javax::swing::JList *, ::java::util::Vector *);
-public:
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
-private:
-  ::java::util::Vector * val$items;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$2__
diff --git a/libjava/javax/swing/JList$3.h b/libjava/javax/swing/JList$3.h
deleted file mode 100644
index 7c71c30763f..00000000000
--- a/libjava/javax/swing/JList$3.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$3__
-#define __javax_swing_JList$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class JList$3;
-    }
-  }
-}
-
-class javax::swing::JList$3 : public ::javax::swing::AbstractListModel
-{
-
-public: // actually package-private
-  JList$3(::javax::swing::JList *, ::java::util::Vector *);
-public:
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
-private:
-  ::java::util::Vector * val$listData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$3__
diff --git a/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h b/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h
deleted file mode 100644
index 1ca2d171014..00000000000
--- a/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$AccessibleJList$AccessibleJListChild__
-#define __javax_swing_JList$AccessibleJList$AccessibleJListChild__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JList;
-        class JList$AccessibleJList;
-        class JList$AccessibleJList$AccessibleJListChild;
-    }
-  }
-}
-
-class javax::swing::JList$AccessibleJList$AccessibleJListChild : public ::javax::accessibility::AccessibleContext
-{
-
-public:
-  JList$AccessibleJList$AccessibleJListChild(::javax::swing::JList$AccessibleJList *, ::javax::swing::JList *, jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jboolean isFocusTraversable();
-  virtual void requestFocus();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) parent;
-  jint listIndex;
-  ::java::awt::Cursor * cursor;
-  ::javax::swing::JList$AccessibleJList * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$AccessibleJList$AccessibleJListChild__
diff --git a/libjava/javax/swing/JList$AccessibleJList.h b/libjava/javax/swing/JList$AccessibleJList.h
deleted file mode 100644
index ca1842f5682..00000000000
--- a/libjava/javax/swing/JList$AccessibleJList.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$AccessibleJList__
-#define __javax_swing_JList$AccessibleJList__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JList;
-        class JList$AccessibleJList;
-      namespace event
-      {
-          class ListDataEvent;
-          class ListSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JList$AccessibleJList : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JList$AccessibleJList(::javax::swing::JList *);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$AccessibleJList__
diff --git a/libjava/javax/swing/JList$ListListener.h b/libjava/javax/swing/JList$ListListener.h
deleted file mode 100644
index 87854ebfd53..00000000000
--- a/libjava/javax/swing/JList$ListListener.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$ListListener__
-#define __javax_swing_JList$ListListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class JList$ListListener;
-      namespace event
-      {
-          class ListDataEvent;
-          class ListSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JList$ListListener : public ::java::lang::Object
-{
-
-  JList$ListListener(::javax::swing::JList *);
-public:
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  JList$ListListener(::javax::swing::JList *, ::javax::swing::JList$ListListener *);
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$ListListener__
diff --git a/libjava/javax/swing/JList.h b/libjava/javax/swing/JList.h
deleted file mode 100644
index 2e68ae501bd..00000000000
--- a/libjava/javax/swing/JList.h
+++ /dev/null
@@ -1,162 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList__
-#define __javax_swing_JList__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JList;
-        class JList$ListListener;
-        class ListCellRenderer;
-        class ListModel;
-        class ListSelectionModel;
-      namespace event
-      {
-          class ListSelectionListener;
-      }
-      namespace plaf
-      {
-          class ListUI;
-      }
-      namespace text
-      {
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::JList : public ::javax::swing::JComponent
-{
-
-public: // actually protected
-  virtual void fireSelectionValueChanged(jint, jint, jboolean);
-public:
-  JList();
-  JList(JArray< ::java::lang::Object * > *);
-  JList(::java::util::Vector *);
-  JList(::javax::swing::ListModel *);
-private:
-  void init(::javax::swing::ListModel *);
-public: // actually protected
-  virtual ::javax::swing::ListSelectionModel * createSelectionModel();
-public:
-  virtual jint getFixedCellHeight();
-  virtual void setFixedCellHeight(jint);
-  virtual jint getFixedCellWidth();
-  virtual void setFixedCellWidth(jint);
-  virtual jint getVisibleRowCount();
-  virtual void setVisibleRowCount(jint);
-  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *);
-  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *);
-  virtual JArray< ::javax::swing::event::ListSelectionListener * > * getListSelectionListeners();
-  virtual jint getSelectionMode();
-  virtual void setSelectionMode(jint);
-  virtual void setSelectedIndex(jint);
-  virtual void setSelectedIndices(JArray< jint > *);
-  virtual jint getSelectedIndex();
-  virtual jboolean isSelectionEmpty();
-  virtual jint getFirstVisibleIndex();
-  virtual jint locationToIndex(::java::awt::Point *);
-  virtual ::java::awt::Point * indexToLocation(jint);
-  virtual jint getLastVisibleIndex();
-  virtual JArray< jint > * getSelectedIndices();
-  virtual jboolean isSelectedIndex(jint);
-  virtual ::java::lang::Object * getSelectedValue();
-  virtual JArray< ::java::lang::Object * > * getSelectedValues();
-  virtual ::java::awt::Color * getSelectionBackground();
-  virtual void setSelectionBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getSelectionForeground();
-  virtual void setSelectionForeground(::java::awt::Color *);
-  virtual void setSelectedValue(::java::lang::Object *, jboolean);
-  virtual void ensureIndexIsVisible(jint);
-  virtual void setListData(JArray< ::java::lang::Object * > *);
-private:
-  ::javax::swing::ListModel * createListModel(JArray< ::java::lang::Object * > *);
-  ::javax::swing::ListModel * createListModel(::java::util::Vector *);
-public:
-  virtual void setListData(::java::util::Vector *);
-  virtual ::javax::swing::ListCellRenderer * getCellRenderer();
-  virtual void setCellRenderer(::javax::swing::ListCellRenderer *);
-  virtual ::javax::swing::ListModel * getModel();
-  virtual void setModel(::javax::swing::ListModel *);
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
-  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
-  virtual ::javax::swing::plaf::ListUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ListUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::lang::Object * getPrototypeCellValue();
-  virtual void setPrototypeCellValue(::java::lang::Object *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jint getAnchorSelectionIndex();
-  virtual jint getLeadSelectionIndex();
-  virtual jint getMinSelectionIndex();
-  virtual jint getMaxSelectionIndex();
-  virtual void clearSelection();
-  virtual void setSelectionInterval(jint, jint);
-  virtual void addSelectionInterval(jint, jint);
-  virtual void removeSelectionInterval(jint, jint);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual jboolean getDragEnabled();
-  virtual void setDragEnabled(jboolean);
-  virtual jint getLayoutOrientation();
-  virtual void setLayoutOrientation(jint);
-  virtual ::java::awt::Rectangle * getCellBounds(jint, jint);
-  virtual jint getNextMatch(::java::lang::String *, jint, ::javax::swing::text::Position$Bias *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 4406629526391098046LL;
-public:
-  static const jint VERTICAL = 0;
-  static const jint VERTICAL_WRAP = 1;
-  static const jint HORIZONTAL_WRAP = 2;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dragEnabled;
-  ::javax::swing::ListCellRenderer * cellRenderer;
-  jint fixedCellWidth;
-  jint fixedCellHeight;
-  jint layoutOrientation;
-  ::javax::swing::ListModel * model;
-  ::java::lang::Object * prototypeCellValue;
-  ::java::awt::Color * selectionBackground;
-  ::java::awt::Color * selectionForeground;
-  ::javax::swing::ListSelectionModel * selectionModel;
-  jint visibleRowCount;
-  ::javax::swing::JList$ListListener * listListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList__
diff --git a/libjava/javax/swing/JMenu$AccessibleJMenu.h b/libjava/javax/swing/JMenu$AccessibleJMenu.h
deleted file mode 100644
index 6c892b49193..00000000000
--- a/libjava/javax/swing/JMenu$AccessibleJMenu.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu$AccessibleJMenu__
-#define __javax_swing_JMenu$AccessibleJMenu__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-    }
-    namespace swing
-    {
-        class JMenu;
-        class JMenu$AccessibleJMenu;
-    }
-  }
-}
-
-class javax::swing::JMenu$AccessibleJMenu : public ::javax::swing::JMenuItem$AccessibleJMenuItem
-{
-
-public: // actually protected
-  JMenu$AccessibleJMenu(::javax::swing::JMenu *);
-public:
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleSelectionCount();
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-private:
-  static const jlong serialVersionUID = -8131864021059524309LL;
-public: // actually package-private
-  ::javax::swing::JMenu * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu$AccessibleJMenu__
diff --git a/libjava/javax/swing/JMenu$ActionChangedListener.h b/libjava/javax/swing/JMenu$ActionChangedListener.h
deleted file mode 100644
index 36623cf27b3..00000000000
--- a/libjava/javax/swing/JMenu$ActionChangedListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu$ActionChangedListener__
-#define __javax_swing_JMenu$ActionChangedListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenu;
-        class JMenu$ActionChangedListener;
-        class JMenuItem;
-    }
-  }
-}
-
-class javax::swing::JMenu$ActionChangedListener : public ::java::lang::Object
-{
-
-public:
-  JMenu$ActionChangedListener(::javax::swing::JMenu *, ::javax::swing::JMenuItem *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-private:
-  ::javax::swing::JMenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) menuItem;
-public: // actually package-private
-  ::javax::swing::JMenu * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu$ActionChangedListener__
diff --git a/libjava/javax/swing/JMenu$MenuChangeListener.h b/libjava/javax/swing/JMenu$MenuChangeListener.h
deleted file mode 100644
index 816f33e54d0..00000000000
--- a/libjava/javax/swing/JMenu$MenuChangeListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu$MenuChangeListener__
-#define __javax_swing_JMenu$MenuChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenu;
-        class JMenu$MenuChangeListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenu$MenuChangeListener : public ::java::lang::Object
-{
-
-  JMenu$MenuChangeListener(::javax::swing::JMenu *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  JMenu$MenuChangeListener(::javax::swing::JMenu *, ::javax::swing::JMenu$MenuChangeListener *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) selected;
-public: // actually package-private
-  ::javax::swing::JMenu * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu$MenuChangeListener__
diff --git a/libjava/javax/swing/JMenu$WinListener.h b/libjava/javax/swing/JMenu$WinListener.h
deleted file mode 100644
index e685e382ef5..00000000000
--- a/libjava/javax/swing/JMenu$WinListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu$WinListener__
-#define __javax_swing_JMenu$WinListener__
-
-#pragma interface
-
-#include <java/awt/event/WindowAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenu;
-        class JMenu$WinListener;
-        class JPopupMenu;
-    }
-  }
-}
-
-class javax::swing::JMenu$WinListener : public ::java::awt::event::WindowAdapter
-{
-
-public:
-  JMenu$WinListener(::javax::swing::JMenu *, ::javax::swing::JPopupMenu *);
-  virtual void windowClosing(::java::awt::event::WindowEvent *);
-private:
-  static const jlong serialVersionUID = -6415815570638474823LL;
-public: // actually package-private
-  ::javax::swing::JMenu * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu$WinListener__
diff --git a/libjava/javax/swing/JMenu.h b/libjava/javax/swing/JMenu.h
deleted file mode 100644
index 112d995a032..00000000000
--- a/libjava/javax/swing/JMenu.h
+++ /dev/null
@@ -1,141 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu__
-#define __javax_swing_JMenu__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class ButtonModel;
-        class JMenu;
-        class JMenu$WinListener;
-        class JMenuItem;
-        class JPopupMenu;
-        class KeyStroke;
-        class MenuElement;
-      namespace event
-      {
-          class ChangeListener;
-          class MenuEvent;
-          class MenuListener;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenu : public ::javax::swing::JMenuItem
-{
-
-public:
-  JMenu();
-  JMenu(::java::lang::String *);
-  JMenu(::javax::swing::Action *);
-  JMenu(::java::lang::String *, jboolean);
-  virtual ::javax::swing::JMenuItem * add(::javax::swing::JMenuItem *);
-  virtual ::java::awt::Component * add(::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::awt::Component *, jint);
-  virtual ::javax::swing::JMenuItem * add(::java::lang::String *);
-  virtual ::javax::swing::JMenuItem * add(::javax::swing::Action *);
-  virtual void remove(::javax::swing::JMenuItem *);
-  virtual void remove(jint);
-  virtual void remove(::java::awt::Component *);
-  virtual void removeAll();
-  virtual void insert(::java::lang::String *, jint);
-  virtual ::javax::swing::JMenuItem * insert(::javax::swing::JMenuItem *, jint);
-  virtual ::javax::swing::JMenuItem * insert(::javax::swing::Action *, jint);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setModel(::javax::swing::ButtonModel *);
-  virtual jboolean isSelected();
-  virtual void setSelected(jboolean);
-  virtual jboolean isPopupMenuVisible();
-  virtual void setPopupMenuVisible(jboolean);
-public: // actually protected
-  virtual ::java::awt::Point * getPopupMenuOrigin();
-public:
-  virtual jint getDelay();
-  virtual void setDelay(jint);
-  virtual void setMenuLocation(jint, jint);
-public: // actually protected
-  virtual ::javax::swing::JMenuItem * createActionComponent(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JMenuItem *);
-public:
-  virtual void addSeparator();
-  virtual void insertSeparator(jint);
-  virtual ::javax::swing::JMenuItem * getItem(jint);
-  virtual jint getItemCount();
-  virtual jboolean isTearOff();
-  virtual jint getMenuComponentCount();
-  virtual ::java::awt::Component * getMenuComponent(jint);
-  virtual JArray< ::java::awt::Component * > * getMenuComponents();
-  virtual jboolean isTopLevelMenu();
-  virtual jboolean isMenuComponent(::java::awt::Component *);
-  virtual ::javax::swing::JPopupMenu * getPopupMenu();
-  virtual void addMenuListener(::javax::swing::event::MenuListener *);
-  virtual void removeMenuListener(::javax::swing::event::MenuListener *);
-  virtual JArray< ::javax::swing::event::MenuListener * > * getMenuListeners();
-public: // actually protected
-  virtual void fireMenuSelected();
-  virtual void fireMenuDeselected();
-  virtual void fireMenuCanceled();
-  virtual ::javax::swing::JMenu$WinListener * createWinListener(::javax::swing::JPopupMenu *);
-public:
-  virtual void menuSelectionChanged(jboolean);
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
-  virtual ::java::awt::Component * getComponent();
-  virtual void setAccelerator(::javax::swing::KeyStroke *);
-public: // actually protected
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual void doClick(jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual JArray< ::javax::swing::MenuElement * > * createPath(::javax::swing::JMenu *);
-private:
-  static const jlong serialVersionUID = 4227225638931828014LL;
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem)))) popupMenu;
-  ::javax::swing::event::MenuEvent * menuEvent;
-  jint delay;
-public: // actually protected
-  ::javax::swing::JMenu$WinListener * popupListener;
-private:
-  ::java::awt::Point * menuLocation;
-  ::javax::swing::event::ChangeListener * menuChangeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu__
diff --git a/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h b/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h
deleted file mode 100644
index 2fcf3ad868d..00000000000
--- a/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuBar$AccessibleJMenuBar__
-#define __javax_swing_JMenuBar$AccessibleJMenuBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JMenuBar;
-        class JMenuBar$AccessibleJMenuBar;
-    }
-  }
-}
-
-class javax::swing::JMenuBar$AccessibleJMenuBar : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JMenuBar$AccessibleJMenuBar(::javax::swing::JMenuBar *);
-public:
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-public: // actually package-private
-  ::javax::swing::JMenuBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuBar$AccessibleJMenuBar__
diff --git a/libjava/javax/swing/JMenuBar.h b/libjava/javax/swing/JMenuBar.h
deleted file mode 100644
index a33d051bacb..00000000000
--- a/libjava/javax/swing/JMenuBar.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuBar__
-#define __javax_swing_JMenuBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JMenu;
-        class JMenuBar;
-        class KeyStroke;
-        class MenuElement;
-        class MenuSelectionManager;
-        class SingleSelectionModel;
-      namespace plaf
-      {
-          class MenuBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenuBar : public ::javax::swing::JComponent
-{
-
-public:
-  JMenuBar();
-  virtual ::javax::swing::JMenu * add(::javax::swing::JMenu *);
-  virtual void addNotify();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::awt::Component * getComponentAtIndex(jint);
-  virtual jint getComponentIndex(::java::awt::Component *);
-  virtual ::javax::swing::JMenu * getHelpMenu();
-  virtual ::java::awt::Insets * getMargin();
-  virtual ::javax::swing::JMenu * getMenu(jint);
-  virtual jint getMenuCount();
-  virtual ::javax::swing::SingleSelectionModel * getSelectionModel();
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
-  virtual ::javax::swing::plaf::MenuBarUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean isBorderPainted();
-  virtual jboolean isSelected();
-  virtual void menuSelectionChanged(jboolean);
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-public: // actually protected
-  virtual jboolean processKeyBinding(::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
-public: // actually package-private
-  static jboolean processKeyBindingHelper(::javax::swing::MenuElement *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
-public:
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void removeNotify();
-  virtual void setBorderPainted(jboolean);
-  virtual void setHelpMenu(::javax::swing::JMenu *);
-  virtual void setMargin(::java::awt::Insets *);
-  virtual void setSelected(::java::awt::Component *);
-  virtual void setSelectionModel(::javax::swing::SingleSelectionModel *);
-  virtual void setUI(::javax::swing::plaf::MenuBarUI *);
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = -8191026883931977036LL;
-  ::javax::swing::SingleSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) selectionModel;
-  jboolean borderPainted;
-  ::java::awt::Insets * margin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuBar__
diff --git a/libjava/javax/swing/JMenuItem$1.h b/libjava/javax/swing/JMenuItem$1.h
deleted file mode 100644
index 566427142f8..00000000000
--- a/libjava/javax/swing/JMenuItem$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuItem$1__
-#define __javax_swing_JMenuItem$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenuItem;
-        class JMenuItem$1;
-    }
-  }
-}
-
-class javax::swing::JMenuItem$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JMenuItem$1(::javax::swing::JMenuItem *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JMenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuItem$1__
diff --git a/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h b/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h
deleted file mode 100644
index 7e67e9df971..00000000000
--- a/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuItem$AccessibleJMenuItem__
-#define __javax_swing_JMenuItem$AccessibleJMenuItem__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JMenuItem;
-        class JMenuItem$AccessibleJMenuItem;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenuItem$AccessibleJMenuItem : public ::javax::swing::AbstractButton$AccessibleAbstractButton
-{
-
-public: // actually package-private
-  JMenuItem$AccessibleJMenuItem(::javax::swing::JMenuItem *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 6748924232082076534LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) armed;
-  jboolean focusOwner;
-  jboolean pressed;
-  jboolean selected;
-public: // actually package-private
-  ::javax::swing::JMenuItem * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuItem$AccessibleJMenuItem__
diff --git a/libjava/javax/swing/JMenuItem.h b/libjava/javax/swing/JMenuItem.h
deleted file mode 100644
index 87d5ff98f59..00000000000
--- a/libjava/javax/swing/JMenuItem.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuItem__
-#define __javax_swing_JMenuItem__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JMenuItem;
-        class KeyStroke;
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class MenuDragMouseEvent;
-          class MenuDragMouseListener;
-          class MenuKeyEvent;
-          class MenuKeyListener;
-      }
-      namespace plaf
-      {
-          class MenuItemUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenuItem : public ::javax::swing::AbstractButton
-{
-
-public:
-  JMenuItem();
-  JMenuItem(::javax::swing::Icon *);
-  JMenuItem(::java::lang::String *);
-  JMenuItem(::javax::swing::Action *);
-  JMenuItem(::java::lang::String *, ::javax::swing::Icon *);
-  JMenuItem(::java::lang::String *, jint);
-public: // actually protected
-  virtual void init(::java::lang::String *, ::javax::swing::Icon *);
-public:
-  virtual void setUI(::javax::swing::plaf::MenuItemUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean isArmed();
-  virtual void setArmed(jboolean);
-  virtual void setEnabled(jboolean);
-  virtual ::javax::swing::KeyStroke * getAccelerator();
-  virtual void setAccelerator(::javax::swing::KeyStroke *);
-public: // actually protected
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
-public:
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void processMenuDragMouseEvent(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void processMenuKeyEvent(::javax::swing::event::MenuKeyEvent *);
-public: // actually protected
-  virtual void fireMenuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void fireMenuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void fireMenuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void fireMenuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void fireMenuKeyPressed(::javax::swing::event::MenuKeyEvent *);
-  virtual void fireMenuKeyReleased(::javax::swing::event::MenuKeyEvent *);
-  virtual void fireMenuKeyTyped(::javax::swing::event::MenuKeyEvent *);
-public:
-  virtual void menuSelectionChanged(jboolean);
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
-  virtual ::java::awt::Component * getComponent();
-  virtual void addMenuDragMouseListener(::javax::swing::event::MenuDragMouseListener *);
-  virtual void removeMenuDragMouseListener(::javax::swing::event::MenuDragMouseListener *);
-  virtual JArray< ::javax::swing::event::MenuDragMouseListener * > * getMenuDragMouseListeners();
-  virtual void addMenuKeyListener(::javax::swing::event::MenuKeyListener *);
-  virtual void removeMenuKeyListener(::javax::swing::event::MenuKeyListener *);
-  virtual JArray< ::javax::swing::event::MenuKeyListener * > * getMenuKeyListeners();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual jboolean onTop();
-private:
-  static const jlong serialVersionUID = -1681004643499461044LL;
-  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton)))) accelerator;
-  jboolean isDragging;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuItem__
diff --git a/libjava/javax/swing/JOptionPane$1.h b/libjava/javax/swing/JOptionPane$1.h
deleted file mode 100644
index 89b46f359ff..00000000000
--- a/libjava/javax/swing/JOptionPane$1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane$1__
-#define __javax_swing_JOptionPane$1__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JOptionPane$1;
-    }
-  }
-}
-
-class javax::swing::JOptionPane$1 : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  JOptionPane$1();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane$1__
diff --git a/libjava/javax/swing/JOptionPane$2.h b/libjava/javax/swing/JOptionPane$2.h
deleted file mode 100644
index 9231d656a39..00000000000
--- a/libjava/javax/swing/JOptionPane$2.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane$2__
-#define __javax_swing_JOptionPane$2__
-
-#pragma interface
-
-#include <java/awt/event/MouseMotionAdapter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JOptionPane$2;
-    }
-  }
-}
-
-class javax::swing::JOptionPane$2 : public ::java::awt::event::MouseMotionAdapter
-{
-
-public: // actually package-private
-  JOptionPane$2();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane$2__
diff --git a/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h b/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h
deleted file mode 100644
index 70b9e984fad..00000000000
--- a/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane$AccessibleJOptionPane__
-#define __javax_swing_JOptionPane$AccessibleJOptionPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JOptionPane;
-        class JOptionPane$AccessibleJOptionPane;
-    }
-  }
-}
-
-class javax::swing::JOptionPane$AccessibleJOptionPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JOptionPane$AccessibleJOptionPane(::javax::swing::JOptionPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 686071432213084821LL;
-public: // actually package-private
-  ::javax::swing::JOptionPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane$AccessibleJOptionPane__
diff --git a/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h b/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h
deleted file mode 100644
index a3d71cf409f..00000000000
--- a/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane$ValuePropertyHandler__
-#define __javax_swing_JOptionPane$ValuePropertyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JDialog;
-        class JOptionPane$ValuePropertyHandler;
-    }
-  }
-}
-
-class javax::swing::JOptionPane$ValuePropertyHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JOptionPane$ValuePropertyHandler(::javax::swing::JDialog *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane$ValuePropertyHandler__
diff --git a/libjava/javax/swing/JOptionPane.h b/libjava/javax/swing/JOptionPane.h
deleted file mode 100644
index 5bd63fd7ae8..00000000000
--- a/libjava/javax/swing/JOptionPane.h
+++ /dev/null
@@ -1,167 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane__
-#define __javax_swing_JOptionPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Frame;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JDesktopPane;
-        class JDialog;
-        class JInternalFrame;
-        class JOptionPane;
-      namespace plaf
-      {
-          class OptionPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JOptionPane : public ::javax::swing::JComponent
-{
-
-public:
-  JOptionPane();
-  JOptionPane(::java::lang::Object *);
-  JOptionPane(::java::lang::Object *, jint);
-  JOptionPane(::java::lang::Object *, jint, jint);
-  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *);
-  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *);
-  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  virtual ::javax::swing::JDialog * createDialog(::java::awt::Component *, ::java::lang::String *);
-  virtual ::javax::swing::JInternalFrame * createInternalFrame(::java::awt::Component *, ::java::lang::String *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  static ::javax::swing::JDesktopPane * getDesktopPaneForComponent(::java::awt::Component *);
-  static ::java::awt::Frame * getFrameForComponent(::java::awt::Component *);
-  virtual ::javax::swing::Icon * getIcon();
-  virtual ::java::lang::Object * getInitialSelectionValue();
-  virtual ::java::lang::Object * getInitialValue();
-  virtual ::java::lang::Object * getInputValue();
-  virtual jint getMaxCharactersPerLineCount();
-  virtual ::java::lang::Object * getMessage();
-  virtual jint getMessageType();
-  virtual JArray< ::java::lang::Object * > * getOptions();
-  virtual jint getOptionType();
-  static ::java::awt::Frame * getRootFrame();
-  virtual JArray< ::java::lang::Object * > * getSelectionValues();
-  virtual ::javax::swing::plaf::OptionPaneUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::lang::Object * getValue();
-  virtual jboolean getWantsInput();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void selectInitialValue();
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual void setInitialSelectionValue(::java::lang::Object *);
-  virtual void setInitialValue(::java::lang::Object *);
-  virtual void setInputValue(::java::lang::Object *);
-  virtual void setMessage(::java::lang::Object *);
-  virtual void setMessageType(jint);
-  virtual void setOptions(JArray< ::java::lang::Object * > *);
-  virtual void setOptionType(jint);
-  static void setRootFrame(::java::awt::Frame *);
-  virtual void setSelectionValues(JArray< ::java::lang::Object * > *);
-  virtual void setUI(::javax::swing::plaf::OptionPaneUI *);
-  virtual void setValue(::java::lang::Object *);
-  virtual void setWantsInput(jboolean);
-  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *);
-  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
-  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *);
-  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *);
-  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static ::java::lang::Object * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static ::java::lang::String * showInputDialog(::java::lang::Object *);
-  static ::java::lang::String * showInputDialog(::java::lang::Object *, ::java::lang::Object *);
-  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *);
-  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
-  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *);
-  static ::java::lang::String * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *);
-  static ::java::lang::String * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static ::java::lang::Object * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *);
-  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *);
-  static jint showInternalOptionDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *);
-  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *);
-  static jint showOptionDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  virtual void updateUI();
-private:
-  jboolean validMessageType(jint);
-  jboolean validOptionType(jint);
-  static void startModal(::javax::swing::JInternalFrame *);
-  static const jlong serialVersionUID = 5231143276678566796LL;
-public:
-  static const jint CANCEL_OPTION = 2;
-  static const jint CLOSED_OPTION = -1;
-  static const jint DEFAULT_OPTION = -1;
-  static const jint NO_OPTION = 1;
-  static const jint OK_CANCEL_OPTION = 2;
-  static const jint OK_OPTION = 0;
-  static const jint YES_NO_CANCEL_OPTION = 1;
-  static const jint YES_NO_OPTION = 0;
-  static const jint YES_OPTION = 0;
-  static const jint ERROR_MESSAGE = 0;
-  static const jint INFORMATION_MESSAGE = 1;
-  static const jint PLAIN_MESSAGE = -1;
-  static const jint QUESTION_MESSAGE = 3;
-  static const jint WARNING_MESSAGE = 2;
-  static ::java::lang::String * ICON_PROPERTY;
-  static ::java::lang::String * INITIAL_SELECTION_VALUE_PROPERTY;
-  static ::java::lang::String * INITIAL_VALUE_PROPERTY;
-  static ::java::lang::String * INPUT_VALUE_PROPERTY;
-  static ::java::lang::String * MESSAGE_PROPERTY;
-  static ::java::lang::String * MESSAGE_TYPE_PROPERTY;
-  static ::java::lang::String * OPTION_TYPE_PROPERTY;
-  static ::java::lang::String * OPTIONS_PROPERTY;
-  static ::java::lang::String * SELECTION_VALUES_PROPERTY;
-  static ::java::lang::String * VALUE_PROPERTY;
-  static ::java::lang::String * WANTS_INPUT_PROPERTY;
-  static ::java::lang::Object * UNINITIALIZED_VALUE;
-public: // actually protected
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) icon;
-  ::java::lang::Object * initialSelectionValue;
-  ::java::lang::Object * initialValue;
-  ::java::lang::Object * inputValue;
-  ::java::lang::Object * message;
-  jint messageType;
-  JArray< ::java::lang::Object * > * options;
-  jint optionType;
-  JArray< ::java::lang::Object * > * selectionValues;
-  ::java::lang::Object * value;
-  jboolean wantsInput;
-private:
-  static ::java::awt::Frame * privFrame;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane__
diff --git a/libjava/javax/swing/JPanel$AccessibleJPanel.h b/libjava/javax/swing/JPanel$AccessibleJPanel.h
deleted file mode 100644
index c4f9878ae6f..00000000000
--- a/libjava/javax/swing/JPanel$AccessibleJPanel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPanel$AccessibleJPanel__
-#define __javax_swing_JPanel$AccessibleJPanel__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JPanel;
-        class JPanel$AccessibleJPanel;
-    }
-  }
-}
-
-class javax::swing::JPanel$AccessibleJPanel : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JPanel$AccessibleJPanel(::javax::swing::JPanel *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JPanel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPanel$AccessibleJPanel__
diff --git a/libjava/javax/swing/JPanel.h b/libjava/javax/swing/JPanel.h
deleted file mode 100644
index 8270c8307d3..00000000000
--- a/libjava/javax/swing/JPanel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPanel__
-#define __javax_swing_JPanel__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class LayoutManager;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JPanel;
-      namespace plaf
-      {
-          class PanelUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JPanel : public ::javax::swing::JComponent
-{
-
-public:
-  JPanel();
-  JPanel(jboolean);
-  JPanel(::java::awt::LayoutManager *);
-  JPanel(::java::awt::LayoutManager *, jboolean);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setUI(::javax::swing::plaf::PanelUI *);
-  virtual ::javax::swing::plaf::PanelUI * getUI();
-  virtual void updateUI();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPanel__
diff --git a/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h b/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h
deleted file mode 100644
index 901558e1e6d..00000000000
--- a/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPasswordField$AccessibleJPasswordField__
-#define __javax_swing_JPasswordField$AccessibleJPasswordField__
-
-#pragma interface
-
-#include <javax/swing/JTextField$AccessibleJTextField.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JPasswordField;
-        class JPasswordField$AccessibleJPasswordField;
-    }
-  }
-}
-
-class javax::swing::JPasswordField$AccessibleJPasswordField : public ::javax::swing::JTextField$AccessibleJTextField
-{
-
-public: // actually protected
-  JPasswordField$AccessibleJPasswordField(::javax::swing::JPasswordField *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -8477039424200681086LL;
-public: // actually package-private
-  ::javax::swing::JPasswordField * __attribute__((aligned(__alignof__( ::javax::swing::JTextField$AccessibleJTextField)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPasswordField$AccessibleJPasswordField__
diff --git a/libjava/javax/swing/JPasswordField.h b/libjava/javax/swing/JPasswordField.h
deleted file mode 100644
index 7e9a8259c42..00000000000
--- a/libjava/javax/swing/JPasswordField.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPasswordField__
-#define __javax_swing_JPasswordField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JPasswordField;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JPasswordField : public ::javax::swing::JTextField
-{
-
-public:
-  JPasswordField();
-  JPasswordField(::java::lang::String *);
-  JPasswordField(jint);
-  JPasswordField(::java::lang::String *, jint);
-  JPasswordField(::javax::swing::text::Document *, ::java::lang::String *, jint);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  virtual ::java::lang::String * getUIClassID();
-  virtual jchar getEchoChar();
-  virtual void setEchoChar(jchar);
-  virtual jboolean echoCharIsSet();
-  virtual void copy();
-  virtual void cut();
-  virtual ::java::lang::String * getText();
-  virtual ::java::lang::String * getText(jint, jint);
-  virtual JArray< jchar > * getPassword();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  jchar __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) echoChar;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPasswordField__
diff --git a/libjava/javax/swing/JPopupMenu$1.h b/libjava/javax/swing/JPopupMenu$1.h
deleted file mode 100644
index 81719f00ee8..00000000000
--- a/libjava/javax/swing/JPopupMenu$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$1__
-#define __javax_swing_JPopupMenu$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class JPopupMenu$1;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JPopupMenu$1(::javax::swing::JPopupMenu *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$1__
diff --git a/libjava/javax/swing/JPopupMenu$2.h b/libjava/javax/swing/JPopupMenu$2.h
deleted file mode 100644
index d8b116b9930..00000000000
--- a/libjava/javax/swing/JPopupMenu$2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$2__
-#define __javax_swing_JPopupMenu$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class JPopupMenu$2;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JPopupMenu$2(::javax::swing::JPopupMenu *, jboolean);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  jboolean val$visible;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$2__
diff --git a/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h b/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h
deleted file mode 100644
index d3ace0c6387..00000000000
--- a/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$AccessibleJPopupMenu__
-#define __javax_swing_JPopupMenu$AccessibleJPopupMenu__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JPopupMenu;
-        class JPopupMenu$AccessibleJPopupMenu;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$AccessibleJPopupMenu : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JPopupMenu$AccessibleJPopupMenu(::javax::swing::JPopupMenu *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 7423261328879849768LL;
-public: // actually package-private
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$AccessibleJPopupMenu__
diff --git a/libjava/javax/swing/JPopupMenu$ActionChangeListener.h b/libjava/javax/swing/JPopupMenu$ActionChangeListener.h
deleted file mode 100644
index 4c2385e4587..00000000000
--- a/libjava/javax/swing/JPopupMenu$ActionChangeListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$ActionChangeListener__
-#define __javax_swing_JPopupMenu$ActionChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class JPopupMenu$ActionChangeListener;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$ActionChangeListener : public ::java::lang::Object
-{
-
-  JPopupMenu$ActionChangeListener(::javax::swing::JPopupMenu *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  JPopupMenu$ActionChangeListener(::javax::swing::JPopupMenu *, ::javax::swing::JPopupMenu$ActionChangeListener *);
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$ActionChangeListener__
diff --git a/libjava/javax/swing/JPopupMenu$Separator.h b/libjava/javax/swing/JPopupMenu$Separator.h
deleted file mode 100644
index e41bdedd6f6..00000000000
--- a/libjava/javax/swing/JPopupMenu$Separator.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$Separator__
-#define __javax_swing_JPopupMenu$Separator__
-
-#pragma interface
-
-#include <javax/swing/JSeparator.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu$Separator;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$Separator : public ::javax::swing::JSeparator
-{
-
-public:
-  JPopupMenu$Separator();
-  virtual ::java::lang::String * getUIClassID();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$Separator__
diff --git a/libjava/javax/swing/JPopupMenu.h b/libjava/javax/swing/JPopupMenu.h
deleted file mode 100644
index 44bbc89bd3e..00000000000
--- a/libjava/javax/swing/JPopupMenu.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu__
-#define __javax_swing_JPopupMenu__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Insets;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class JMenuItem;
-        class JPopupMenu;
-        class MenuElement;
-        class MenuSelectionManager;
-        class Popup;
-        class SingleSelectionModel;
-      namespace event
-      {
-          class MenuKeyListener;
-          class PopupMenuListener;
-      }
-      namespace plaf
-      {
-          class PopupMenuUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JPopupMenu : public ::javax::swing::JComponent
-{
-
-public:
-  JPopupMenu();
-  JPopupMenu(::java::lang::String *);
-  virtual ::javax::swing::JMenuItem * add(::javax::swing::JMenuItem *);
-  virtual ::javax::swing::JMenuItem * add(::java::lang::String *);
-  virtual ::javax::swing::JMenuItem * add(::javax::swing::Action *);
-  virtual void remove(jint);
-  virtual void insert(::javax::swing::Action *, jint);
-  virtual void insert(::java::awt::Component *, jint);
-  static jboolean getDefaultLightWeightPopupEnabled();
-  static void setDefaultLightWeightPopupEnabled(jboolean);
-  virtual ::javax::swing::plaf::PopupMenuUI * getUI();
-  virtual void setUI(::javax::swing::plaf::PopupMenuUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::SingleSelectionModel * getSelectionModel();
-  virtual void setSelectionModel(::javax::swing::SingleSelectionModel *);
-public: // actually protected
-  virtual ::javax::swing::JMenuItem * createActionComponent(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JMenuItem *);
-public:
-  virtual jboolean isLightWeightPopupEnabled();
-  virtual void setLightWeightPopupEnabled(jboolean);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  virtual void addSeparator();
-  virtual void addMenuKeyListener(::javax::swing::event::MenuKeyListener *);
-  virtual void removeMenuKeyListener(::javax::swing::event::MenuKeyListener *);
-  virtual JArray< ::javax::swing::event::MenuKeyListener * > * getMenuKeyListeners();
-  virtual void addPopupMenuListener(::javax::swing::event::PopupMenuListener *);
-  virtual void removePopupMenuListener(::javax::swing::event::PopupMenuListener *);
-  virtual JArray< ::javax::swing::event::PopupMenuListener * > * getPopupMenuListeners();
-public: // actually protected
-  virtual void firePopupMenuWillBecomeVisible();
-  virtual void firePopupMenuWillBecomeInvisible();
-  virtual void firePopupMenuCanceled();
-public:
-  virtual void pack();
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual void setLocation(jint, jint);
-  virtual ::java::awt::Component * getInvoker();
-  virtual void setInvoker(::java::awt::Component *);
-  virtual void show(::java::awt::Component *, jint, jint);
-  virtual ::java::awt::Component * getComponentAtIndex(jint);
-  virtual jint getComponentIndex(::java::awt::Component *);
-  virtual void setPopupSize(::java::awt::Dimension *);
-  virtual void setPopupSize(jint, jint);
-  virtual void setSelected(::java::awt::Component *);
-  virtual jboolean isBorderPainted();
-  virtual void setBorderPainted(jboolean);
-  virtual ::java::awt::Insets * getMargin();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void menuSelectionChanged(jboolean);
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
-  virtual ::java::awt::Component * getComponent();
-  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual jboolean onTop();
-private:
-  static const jlong serialVersionUID = -8336996630009646009LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) borderPainted;
-  static jboolean DefaultLightWeightPopupEnabled;
-public: // actually package-private
-  ::java::awt::Component * invoker;
-private:
-  ::java::lang::String * label;
-  ::java::awt::Insets * margin;
-  jboolean lightWeightPopupEnabled;
-public: // actually protected
-  ::javax::swing::SingleSelectionModel * selectionModel;
-private:
-  ::javax::swing::Popup * popup;
-  jint popupLocationX;
-  jint popupLocationY;
-  jboolean visible;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu__
diff --git a/libjava/javax/swing/JProgressBar$1.h b/libjava/javax/swing/JProgressBar$1.h
deleted file mode 100644
index 2c11387e9b5..00000000000
--- a/libjava/javax/swing/JProgressBar$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JProgressBar$1__
-#define __javax_swing_JProgressBar$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JProgressBar;
-        class JProgressBar$1;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JProgressBar$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JProgressBar$1(::javax::swing::JProgressBar *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JProgressBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JProgressBar$1__
diff --git a/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h b/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h
deleted file mode 100644
index b5b7016359c..00000000000
--- a/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JProgressBar$AccessibleJProgressBar__
-#define __javax_swing_JProgressBar$AccessibleJProgressBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JProgressBar;
-        class JProgressBar$AccessibleJProgressBar;
-    }
-  }
-}
-
-class javax::swing::JProgressBar$AccessibleJProgressBar : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JProgressBar$AccessibleJProgressBar(::javax::swing::JProgressBar *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -2938130009392721813LL;
-public: // actually package-private
-  ::javax::swing::JProgressBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JProgressBar$AccessibleJProgressBar__
diff --git a/libjava/javax/swing/JProgressBar.h b/libjava/javax/swing/JProgressBar.h
deleted file mode 100644
index 459af9ad57a..00000000000
--- a/libjava/javax/swing/JProgressBar.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JProgressBar__
-#define __javax_swing_JProgressBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class BoundedRangeModel;
-        class JProgressBar;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ProgressBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JProgressBar : public ::javax::swing::JComponent
-{
-
-public:
-  JProgressBar();
-  JProgressBar(jint);
-  JProgressBar(jint, jint);
-  JProgressBar(jint, jint, jint);
-  JProgressBar(::javax::swing::BoundedRangeModel *);
-  virtual jint getValue();
-  virtual void setValue(jint);
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-public:
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual jboolean isStringPainted();
-  virtual void setStringPainted(jboolean);
-  virtual ::java::lang::String * getString();
-  virtual void setString(::java::lang::String *);
-  virtual jdouble getPercentComplete();
-  virtual jboolean isBorderPainted();
-  virtual void setBorderPainted(jboolean);
-  virtual ::javax::swing::plaf::ProgressBarUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ProgressBarUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual ::javax::swing::BoundedRangeModel * getModel();
-  virtual void setModel(::javax::swing::BoundedRangeModel *);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void setIndeterminate(jboolean);
-  virtual jboolean isIndeterminate();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 1980046021813598781LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) indeterminate;
-public: // actually protected
-  jint orientation;
-  jboolean paintBorder__;
-  ::javax::swing::BoundedRangeModel * model;
-  ::java::lang::String * progressString;
-  jboolean paintString;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  ::javax::swing::event::ChangeListener * changeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JProgressBar__
diff --git a/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h b/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h
deleted file mode 100644
index 9dc147a8b43..00000000000
--- a/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRadioButton$AccessibleJRadioButton__
-#define __javax_swing_JRadioButton$AccessibleJRadioButton__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton$AccessibleJToggleButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JRadioButton;
-        class JRadioButton$AccessibleJRadioButton;
-    }
-  }
-}
-
-class javax::swing::JRadioButton$AccessibleJRadioButton : public ::javax::swing::JToggleButton$AccessibleJToggleButton
-{
-
-public: // actually protected
-  JRadioButton$AccessibleJRadioButton(::javax::swing::JRadioButton *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 4850967637026120674LL;
-public: // actually package-private
-  ::javax::swing::JRadioButton * __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$AccessibleJToggleButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRadioButton$AccessibleJRadioButton__
diff --git a/libjava/javax/swing/JRadioButton.h b/libjava/javax/swing/JRadioButton.h
deleted file mode 100644
index 7c8bd4f6990..00000000000
--- a/libjava/javax/swing/JRadioButton.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRadioButton__
-#define __javax_swing_JRadioButton__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JRadioButton;
-    }
-  }
-}
-
-class javax::swing::JRadioButton : public ::javax::swing::JToggleButton
-{
-
-public:
-  JRadioButton();
-  JRadioButton(::javax::swing::Action *);
-  JRadioButton(::javax::swing::Icon *);
-  JRadioButton(::javax::swing::Icon *, jboolean);
-  JRadioButton(::java::lang::String *);
-  JRadioButton(::java::lang::String *, jboolean);
-  JRadioButton(::java::lang::String *, ::javax::swing::Icon *);
-  JRadioButton(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = 7751949583255506856LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRadioButton__
diff --git a/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h b/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h
deleted file mode 100644
index 7ef610cfcf3..00000000000
--- a/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
-#define __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JRadioButtonMenuItem;
-        class JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem;
-    }
-  }
-}
-
-class javax::swing::JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem : public ::javax::swing::JMenuItem$AccessibleJMenuItem
-{
-
-public: // actually protected
-  JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem(::javax::swing::JRadioButtonMenuItem *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 4381471510145292179LL;
-public: // actually package-private
-  ::javax::swing::JRadioButtonMenuItem * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
diff --git a/libjava/javax/swing/JRadioButtonMenuItem.h b/libjava/javax/swing/JRadioButtonMenuItem.h
deleted file mode 100644
index 4c982cff9b4..00000000000
--- a/libjava/javax/swing/JRadioButtonMenuItem.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRadioButtonMenuItem__
-#define __javax_swing_JRadioButtonMenuItem__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JRadioButtonMenuItem;
-    }
-  }
-}
-
-class javax::swing::JRadioButtonMenuItem : public ::javax::swing::JMenuItem
-{
-
-public:
-  JRadioButtonMenuItem();
-  JRadioButtonMenuItem(::javax::swing::Icon *);
-  JRadioButtonMenuItem(::java::lang::String *);
-  JRadioButtonMenuItem(::javax::swing::Action *);
-  JRadioButtonMenuItem(::java::lang::String *, ::javax::swing::Icon *);
-  JRadioButtonMenuItem(::java::lang::String *, jboolean);
-  JRadioButtonMenuItem(::javax::swing::Icon *, jboolean);
-  JRadioButtonMenuItem(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void requestFocus();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 8482658191548521743LL;
-  static ::java::lang::String * uiClassID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRadioButtonMenuItem__
diff --git a/libjava/javax/swing/JRootPane$AccessibleJRootPane.h b/libjava/javax/swing/JRootPane$AccessibleJRootPane.h
deleted file mode 100644
index a527b57d27a..00000000000
--- a/libjava/javax/swing/JRootPane$AccessibleJRootPane.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRootPane$AccessibleJRootPane__
-#define __javax_swing_JRootPane$AccessibleJRootPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JRootPane;
-        class JRootPane$AccessibleJRootPane;
-    }
-  }
-}
-
-class javax::swing::JRootPane$AccessibleJRootPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JRootPane$AccessibleJRootPane(::javax::swing::JRootPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 1082432482784468088LL;
-public: // actually package-private
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRootPane$AccessibleJRootPane__
diff --git a/libjava/javax/swing/JRootPane$RootLayout.h b/libjava/javax/swing/JRootPane$RootLayout.h
deleted file mode 100644
index 22967dea0ad..00000000000
--- a/libjava/javax/swing/JRootPane$RootLayout.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRootPane$RootLayout__
-#define __javax_swing_JRootPane$RootLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRootPane;
-        class JRootPane$RootLayout;
-    }
-  }
-}
-
-class javax::swing::JRootPane$RootLayout : public ::java::lang::Object
-{
-
-public: // actually protected
-  JRootPane$RootLayout(::javax::swing::JRootPane *);
-public:
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-private:
-  static const jlong serialVersionUID = -4100116998559815027LL;
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glassPaneBounds;
-  ::java::awt::Rectangle * layeredPaneBounds;
-  ::java::awt::Rectangle * contentPaneBounds;
-  ::java::awt::Rectangle * menuBarBounds;
-public: // actually package-private
-  ::javax::swing::JRootPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRootPane$RootLayout__
diff --git a/libjava/javax/swing/JRootPane.h b/libjava/javax/swing/JRootPane.h
deleted file mode 100644
index 7d415773ff8..00000000000
--- a/libjava/javax/swing/JRootPane.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRootPane__
-#define __javax_swing_JRootPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class LayoutManager;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class JButton;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-      namespace plaf
-      {
-          class RootPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JRootPane : public ::javax::swing::JComponent
-{
-
-public:
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-  virtual void setMenuBar(::javax::swing::JMenuBar *);
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual ::javax::swing::JMenuBar * getMenuBar();
-  virtual jboolean isValidateRoot();
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  JRootPane();
-public: // actually protected
-  virtual ::java::awt::LayoutManager * createRootLayout();
-  virtual ::java::awt::Container * createContentPane();
-  virtual ::java::awt::Component * createGlassPane();
-  virtual ::javax::swing::JLayeredPane * createLayeredPane();
-public:
-  virtual ::javax::swing::plaf::RootPaneUI * getUI();
-  virtual void setUI(::javax::swing::plaf::RootPaneUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::JButton * getDefaultButton();
-  virtual void setDefaultButton(::javax::swing::JButton *);
-  virtual jint getWindowDecorationStyle();
-  virtual void setWindowDecorationStyle(jint);
-  virtual jboolean isOptimizedDrawingEnable();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 8690748000348575668LL;
-public:
-  static const jint NONE = 0;
-  static const jint FRAME = 1;
-  static const jint PLAIN_DIALOG = 2;
-  static const jint INFORMATION_DIALOG = 3;
-  static const jint ERROR_DIALOG = 4;
-  static const jint COLOR_CHOOSER_DIALOG = 5;
-  static const jint FILE_CHOOSER_DIALOG = 6;
-  static const jint QUESTION_DIALOG = 7;
-  static const jint WARNING_DIALOG = 8;
-public: // actually protected
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) glassPane;
-  ::javax::swing::JLayeredPane * layeredPane;
-  ::javax::swing::JMenuBar * menuBar;
-  ::java::awt::Container * contentPane;
-  ::javax::swing::JButton * defaultButton;
-  ::javax::swing::Action * defaultPressAction;
-  ::javax::swing::Action * defaultReleaseAction;
-private:
-  jint windowDecorationStyle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRootPane__
diff --git a/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h b/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h
deleted file mode 100644
index 1e57461a716..00000000000
--- a/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollBar$AccessibleJScrollBar__
-#define __javax_swing_JScrollBar$AccessibleJScrollBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollBar$AccessibleJScrollBar;
-    }
-  }
-}
-
-class javax::swing::JScrollBar$AccessibleJScrollBar : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JScrollBar$AccessibleJScrollBar(::javax::swing::JScrollBar *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -7758162392045586663LL;
-public: // actually package-private
-  ::javax::swing::JScrollBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollBar$AccessibleJScrollBar__
diff --git a/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h b/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h
deleted file mode 100644
index 9ac76b23a2a..00000000000
--- a/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollBar$ScrollBarChangeListener__
-#define __javax_swing_JScrollBar$ScrollBarChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollBar$ScrollBarChangeListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JScrollBar$ScrollBarChangeListener : public ::java::lang::Object
-{
-
-  JScrollBar$ScrollBarChangeListener(::javax::swing::JScrollBar *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  JScrollBar$ScrollBarChangeListener(::javax::swing::JScrollBar *, ::javax::swing::JScrollBar$ScrollBarChangeListener *);
-  ::javax::swing::JScrollBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollBar$ScrollBarChangeListener__
diff --git a/libjava/javax/swing/JScrollBar.h b/libjava/javax/swing/JScrollBar.h
deleted file mode 100644
index b72d2698c7d..00000000000
--- a/libjava/javax/swing/JScrollBar.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollBar__
-#define __javax_swing_JScrollBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class AdjustmentListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class BoundedRangeModel;
-        class JScrollBar;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ScrollBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JScrollBar : public ::javax::swing::JComponent
-{
-
-public:
-  JScrollBar();
-  JScrollBar(jint);
-  JScrollBar(jint, jint, jint, jint, jint);
-  virtual void setUI(::javax::swing::plaf::ScrollBarUI *);
-  virtual ::javax::swing::plaf::ScrollBarUI * getUI();
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual ::javax::swing::BoundedRangeModel * getModel();
-  virtual void setModel(::javax::swing::BoundedRangeModel *);
-  virtual jint getUnitIncrement(jint);
-  virtual void setUnitIncrement(jint);
-  virtual jint getBlockIncrement(jint);
-  virtual void setBlockIncrement(jint);
-  virtual jint getUnitIncrement();
-  virtual jint getBlockIncrement();
-  virtual jint getValue();
-  virtual void setValue(jint);
-  virtual jint getVisibleAmount();
-  virtual void setVisibleAmount(jint);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual void setValues(jint, jint, jint, jint);
-  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual JArray< ::java::awt::event::AdjustmentListener * > * getAdjustmentListeners();
-public: // actually protected
-  virtual void fireAdjustmentValueChanged(jint, jint, jint);
-public: // actually package-private
-  virtual void fireAdjustmentValueChanged(jint, jint, jint, jboolean);
-public:
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual void setEnabled(jboolean);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -8195169869225066566LL;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) blockIncrement;
-  ::javax::swing::BoundedRangeModel * model;
-  jint orientation;
-  jint unitIncrement;
-private:
-  ::javax::swing::event::ChangeListener * sbChangeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollBar__
diff --git a/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h b/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h
deleted file mode 100644
index 4075f51a966..00000000000
--- a/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollPane$AccessibleJScrollPane__
-#define __javax_swing_JScrollPane$AccessibleJScrollPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollPane;
-        class JScrollPane$AccessibleJScrollPane;
-        class JViewport;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JScrollPane$AccessibleJScrollPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JScrollPane$AccessibleJScrollPane(::javax::swing::JScrollPane *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void resetViewPort();
-public: // actually protected
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) viewPort;
-public: // actually package-private
-  ::javax::swing::JScrollPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollPane$AccessibleJScrollPane__
diff --git a/libjava/javax/swing/JScrollPane$ScrollBar.h b/libjava/javax/swing/JScrollPane$ScrollBar.h
deleted file mode 100644
index 92ca958e9df..00000000000
--- a/libjava/javax/swing/JScrollPane$ScrollBar.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollPane$ScrollBar__
-#define __javax_swing_JScrollPane$ScrollBar__
-
-#pragma interface
-
-#include <javax/swing/JScrollBar.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollPane;
-        class JScrollPane$ScrollBar;
-    }
-  }
-}
-
-class javax::swing::JScrollPane$ScrollBar : public ::javax::swing::JScrollBar
-{
-
-public:
-  JScrollPane$ScrollBar(::javax::swing::JScrollPane *, jint);
-  virtual jint getBlockIncrement(jint);
-  virtual jint getUnitIncrement(jint);
-private:
-  static const jlong serialVersionUID = -42032395320987283LL;
-public: // actually package-private
-  ::javax::swing::JScrollPane * __attribute__((aligned(__alignof__( ::javax::swing::JScrollBar)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollPane$ScrollBar__
diff --git a/libjava/javax/swing/JScrollPane.h b/libjava/javax/swing/JScrollPane.h
deleted file mode 100644
index 6cef5ac4ff0..00000000000
--- a/libjava/javax/swing/JScrollPane.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollPane__
-#define __javax_swing_JScrollPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class ComponentOrientation;
-        class LayoutManager;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollPane;
-        class JViewport;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class ScrollPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JScrollPane : public ::javax::swing::JComponent
-{
-
-public:
-  virtual ::javax::swing::JViewport * getColumnHeader();
-  virtual ::java::awt::Component * getCorner(::java::lang::String *);
-  virtual ::javax::swing::JScrollBar * getHorizontalScrollBar();
-  virtual jint getHorizontalScrollBarPolicy();
-  virtual ::javax::swing::JViewport * getRowHeader();
-  virtual ::javax::swing::JScrollBar * getVerticalScrollBar();
-  virtual jint getVerticalScrollBarPolicy();
-  virtual ::javax::swing::JViewport * getViewport();
-  virtual ::javax::swing::border::Border * getViewportBorder();
-  virtual ::java::awt::Rectangle * getViewportBorderBounds();
-  virtual jboolean isWheelScrollingEnabled();
-private:
-  void sync();
-  void removeNonNull(::java::awt::Component *);
-  void addNonNull(::java::awt::Component *, ::java::lang::Object *);
-public:
-  virtual void setComponentOrientation(::java::awt::ComponentOrientation *);
-  virtual void setColumnHeader(::javax::swing::JViewport *);
-  virtual void setColumnHeaderView(::java::awt::Component *);
-  virtual void setCorner(::java::lang::String *, ::java::awt::Component *);
-  virtual void setHorizontalScrollBar(::javax::swing::JScrollBar *);
-  virtual void setHorizontalScrollBarPolicy(jint);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setRowHeader(::javax::swing::JViewport *);
-  virtual void setRowHeaderView(::java::awt::Component *);
-  virtual void setVerticalScrollBar(::javax::swing::JScrollBar *);
-  virtual void setVerticalScrollBarPolicy(jint);
-  virtual void setWheelScrollingEnabled(jboolean);
-  virtual void setViewport(::javax::swing::JViewport *);
-  virtual void setViewportBorder(::javax::swing::border::Border *);
-  virtual void setViewportView(::java::awt::Component *);
-  virtual jboolean isValidateRoot();
-  JScrollPane();
-  JScrollPane(::java::awt::Component *);
-  JScrollPane(jint, jint);
-  JScrollPane(::java::awt::Component *, jint, jint);
-  virtual ::javax::swing::JScrollBar * createHorizontalScrollBar();
-  virtual ::javax::swing::JScrollBar * createVerticalScrollBar();
-public: // actually protected
-  virtual ::javax::swing::JViewport * createViewport();
-public:
-  virtual ::java::lang::String * getUIClassID();
-  virtual void updateUI();
-  virtual ::javax::swing::plaf::ScrollPaneUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ScrollPaneUI *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 5203525440012340014LL;
-public: // actually protected
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) columnHeader;
-  ::javax::swing::JViewport * rowHeader;
-  ::java::awt::Component * lowerLeft;
-  ::java::awt::Component * lowerRight;
-  ::java::awt::Component * upperLeft;
-  ::java::awt::Component * upperRight;
-  ::javax::swing::JScrollBar * horizontalScrollBar;
-  jint horizontalScrollBarPolicy;
-  ::javax::swing::JScrollBar * verticalScrollBar;
-  jint verticalScrollBarPolicy;
-  ::javax::swing::JViewport * viewport;
-private:
-  ::javax::swing::border::Border * viewportBorder;
-  jboolean wheelScrollingEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollPane__
diff --git a/libjava/javax/swing/JSeparator$AccessibleJSeparator.h b/libjava/javax/swing/JSeparator$AccessibleJSeparator.h
deleted file mode 100644
index 9d0db79d308..00000000000
--- a/libjava/javax/swing/JSeparator$AccessibleJSeparator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSeparator$AccessibleJSeparator__
-#define __javax_swing_JSeparator$AccessibleJSeparator__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JSeparator;
-        class JSeparator$AccessibleJSeparator;
-    }
-  }
-}
-
-class javax::swing::JSeparator$AccessibleJSeparator : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JSeparator$AccessibleJSeparator(::javax::swing::JSeparator *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 916332890553201095LL;
-public: // actually package-private
-  ::javax::swing::JSeparator * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSeparator$AccessibleJSeparator__
diff --git a/libjava/javax/swing/JSeparator.h b/libjava/javax/swing/JSeparator.h
deleted file mode 100644
index 22d1a263f3f..00000000000
--- a/libjava/javax/swing/JSeparator.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSeparator__
-#define __javax_swing_JSeparator__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JSeparator;
-      namespace plaf
-      {
-          class SeparatorUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JSeparator : public ::javax::swing::JComponent
-{
-
-public:
-  JSeparator();
-  JSeparator(jint);
-  virtual ::javax::swing::plaf::SeparatorUI * getUI();
-  virtual void setUI(::javax::swing::plaf::SeparatorUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 125301223445282357LL;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) orientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSeparator__
diff --git a/libjava/javax/swing/JSlider$1.h b/libjava/javax/swing/JSlider$1.h
deleted file mode 100644
index 0190b0348e3..00000000000
--- a/libjava/javax/swing/JSlider$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSlider$1__
-#define __javax_swing_JSlider$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSlider;
-        class JSlider$1;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JSlider$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JSlider$1(::javax::swing::JSlider *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSlider$1__
diff --git a/libjava/javax/swing/JSlider$AccessibleJSlider.h b/libjava/javax/swing/JSlider$AccessibleJSlider.h
deleted file mode 100644
index 9e3c2e8df8c..00000000000
--- a/libjava/javax/swing/JSlider$AccessibleJSlider.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSlider$AccessibleJSlider__
-#define __javax_swing_JSlider$AccessibleJSlider__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JSlider;
-        class JSlider$AccessibleJSlider;
-    }
-  }
-}
-
-class javax::swing::JSlider$AccessibleJSlider : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JSlider$AccessibleJSlider(::javax::swing::JSlider *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -6301740148041106789LL;
-public: // actually package-private
-  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSlider$AccessibleJSlider__
diff --git a/libjava/javax/swing/JSlider$LabelUIResource.h b/libjava/javax/swing/JSlider$LabelUIResource.h
deleted file mode 100644
index 58832751561..00000000000
--- a/libjava/javax/swing/JSlider$LabelUIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSlider$LabelUIResource__
-#define __javax_swing_JSlider$LabelUIResource__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSlider;
-        class JSlider$LabelUIResource;
-    }
-  }
-}
-
-class javax::swing::JSlider$LabelUIResource : public ::javax::swing::JLabel
-{
-
-public: // actually package-private
-  JSlider$LabelUIResource(::javax::swing::JSlider *, ::java::lang::String *, jint);
-  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSlider$LabelUIResource__
diff --git a/libjava/javax/swing/JSlider.h b/libjava/javax/swing/JSlider.h
deleted file mode 100644
index e7a54950fc5..00000000000
--- a/libjava/javax/swing/JSlider.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSlider__
-#define __javax_swing_JSlider__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class BoundedRangeModel;
-        class JSlider;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class SliderUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JSlider : public ::javax::swing::JComponent
-{
-
-public:
-  JSlider();
-  JSlider(jint);
-  JSlider(jint, jint);
-  JSlider(jint, jint, jint);
-  JSlider(jint, jint, jint, jint);
-  JSlider(::javax::swing::BoundedRangeModel *);
-  virtual jint getValue();
-  virtual void setValue(jint);
-  virtual ::javax::swing::plaf::SliderUI * getUI();
-  virtual void setUI(::javax::swing::plaf::SliderUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual ::javax::swing::BoundedRangeModel * getModel();
-  virtual void setModel(::javax::swing::BoundedRangeModel *);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual jint getExtent();
-  virtual void setExtent(jint);
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual ::java::util::Dictionary * getLabelTable();
-  virtual void setLabelTable(::java::util::Dictionary *);
-public: // actually protected
-  virtual void updateLabelUIs();
-public:
-  virtual ::java::util::Hashtable * createStandardLabels(jint);
-  virtual ::java::util::Hashtable * createStandardLabels(jint, jint);
-  virtual jboolean getInverted();
-  virtual void setInverted(jboolean);
-  virtual jint getMajorTickSpacing();
-  virtual void setMajorTickSpacing(jint);
-  virtual jint getMinorTickSpacing();
-  virtual void setMinorTickSpacing(jint);
-  virtual jboolean getSnapToTicks();
-  virtual void setSnapToTicks(jboolean);
-  virtual jboolean getPaintTicks();
-  virtual void setPaintTicks(jboolean);
-  virtual jboolean getPaintTrack();
-  virtual void setPaintTrack(jboolean);
-  virtual jboolean getPaintLabels();
-  virtual void setPaintLabels(jboolean);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -1441275936141218479LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) paintTicks;
-  jboolean paintTrack;
-  jboolean paintLabels;
-  ::java::util::Dictionary * labelTable;
-public: // actually protected
-  ::javax::swing::BoundedRangeModel * sliderModel;
-  jint majorTickSpacing;
-  jint minorTickSpacing;
-  jboolean snapToTicks;
-  jint orientation;
-private:
-  jboolean isInverted;
-public: // actually protected
-  ::javax::swing::event::ChangeListener * changeListener;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSlider__
diff --git a/libjava/javax/swing/JSpinner$DateEditor.h b/libjava/javax/swing/JSpinner$DateEditor.h
deleted file mode 100644
index 228da355c91..00000000000
--- a/libjava/javax/swing/JSpinner$DateEditor.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$DateEditor__
-#define __javax_swing_JSpinner$DateEditor__
-
-#pragma interface
-
-#include <javax/swing/JSpinner$DefaultEditor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner;
-        class JSpinner$DateEditor;
-        class SpinnerDateModel;
-    }
-  }
-}
-
-class javax::swing::JSpinner$DateEditor : public ::javax::swing::JSpinner$DefaultEditor
-{
-
-public:
-  JSpinner$DateEditor(::javax::swing::JSpinner *);
-  JSpinner$DateEditor(::javax::swing::JSpinner *, ::java::lang::String *);
-  virtual ::java::text::SimpleDateFormat * getFormat();
-  virtual ::javax::swing::SpinnerDateModel * getModel();
-private:
-  static const jlong serialVersionUID = -4279356973770397815LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$DateEditor__
diff --git a/libjava/javax/swing/JSpinner$DateEditorFormatter.h b/libjava/javax/swing/JSpinner$DateEditorFormatter.h
deleted file mode 100644
index f83b4348a76..00000000000
--- a/libjava/javax/swing/JSpinner$DateEditorFormatter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$DateEditorFormatter__
-#define __javax_swing_JSpinner$DateEditorFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/DateFormatter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner$DateEditorFormatter;
-    }
-  }
-}
-
-class javax::swing::JSpinner$DateEditorFormatter : public ::javax::swing::text::DateFormatter
-{
-
-public:
-  JSpinner$DateEditorFormatter();
-  JSpinner$DateEditorFormatter(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$DateEditorFormatter__
diff --git a/libjava/javax/swing/JSpinner$DefaultEditor.h b/libjava/javax/swing/JSpinner$DefaultEditor.h
deleted file mode 100644
index b586f07b4b6..00000000000
--- a/libjava/javax/swing/JSpinner$DefaultEditor.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$DefaultEditor__
-#define __javax_swing_JSpinner$DefaultEditor__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-        class JSpinner;
-        class JSpinner$DefaultEditor;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JSpinner$DefaultEditor : public ::javax::swing::JPanel
-{
-
-public:
-  JSpinner$DefaultEditor(::javax::swing::JSpinner *);
-  virtual ::javax::swing::JSpinner * getSpinner();
-  virtual void commitEdit();
-  virtual void dismiss(::javax::swing::JSpinner *);
-  virtual ::javax::swing::JFormattedTextField * getTextField();
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-private:
-  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) spinner;
-public: // actually package-private
-  ::javax::swing::JFormattedTextField * ftf;
-private:
-  static const jlong serialVersionUID = -5317788736173368172LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$DefaultEditor__
diff --git a/libjava/javax/swing/JSpinner$ListEditor.h b/libjava/javax/swing/JSpinner$ListEditor.h
deleted file mode 100644
index 9ee06ff71ea..00000000000
--- a/libjava/javax/swing/JSpinner$ListEditor.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$ListEditor__
-#define __javax_swing_JSpinner$ListEditor__
-
-#pragma interface
-
-#include <javax/swing/JSpinner$DefaultEditor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner;
-        class JSpinner$ListEditor;
-        class SpinnerListModel;
-    }
-  }
-}
-
-class javax::swing::JSpinner$ListEditor : public ::javax::swing::JSpinner$DefaultEditor
-{
-
-public:
-  JSpinner$ListEditor(::javax::swing::JSpinner *);
-  virtual ::javax::swing::SpinnerListModel * getModel();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$ListEditor__
diff --git a/libjava/javax/swing/JSpinner$ModelListener.h b/libjava/javax/swing/JSpinner$ModelListener.h
deleted file mode 100644
index b91ea5e30e7..00000000000
--- a/libjava/javax/swing/JSpinner$ModelListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$ModelListener__
-#define __javax_swing_JSpinner$ModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner;
-        class JSpinner$ModelListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JSpinner$ModelListener : public ::java::lang::Object
-{
-
-public:
-  JSpinner$ModelListener(::javax::swing::JSpinner *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$ModelListener__
diff --git a/libjava/javax/swing/JSpinner$NumberEditor.h b/libjava/javax/swing/JSpinner$NumberEditor.h
deleted file mode 100644
index a3a8dd166e2..00000000000
--- a/libjava/javax/swing/JSpinner$NumberEditor.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$NumberEditor__
-#define __javax_swing_JSpinner$NumberEditor__
-
-#pragma interface
-
-#include <javax/swing/JSpinner$DefaultEditor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DecimalFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner;
-        class JSpinner$NumberEditor;
-        class SpinnerNumberModel;
-    }
-  }
-}
-
-class javax::swing::JSpinner$NumberEditor : public ::javax::swing::JSpinner$DefaultEditor
-{
-
-public:
-  JSpinner$NumberEditor(::javax::swing::JSpinner *);
-  JSpinner$NumberEditor(::javax::swing::JSpinner *, ::java::lang::String *);
-  virtual ::java::text::DecimalFormat * getFormat();
-  virtual ::javax::swing::SpinnerNumberModel * getModel();
-private:
-  static const jlong serialVersionUID = 3791956183098282942LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$NumberEditor__
diff --git a/libjava/javax/swing/JSpinner$NumberEditorFormatter.h b/libjava/javax/swing/JSpinner$NumberEditorFormatter.h
deleted file mode 100644
index 6c2550415cf..00000000000
--- a/libjava/javax/swing/JSpinner$NumberEditorFormatter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$NumberEditorFormatter__
-#define __javax_swing_JSpinner$NumberEditorFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/NumberFormatter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner$NumberEditorFormatter;
-    }
-  }
-}
-
-class javax::swing::JSpinner$NumberEditorFormatter : public ::javax::swing::text::NumberFormatter
-{
-
-public:
-  JSpinner$NumberEditorFormatter();
-  JSpinner$NumberEditorFormatter(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$NumberEditorFormatter__
diff --git a/libjava/javax/swing/JSpinner.h b/libjava/javax/swing/JSpinner.h
deleted file mode 100644
index 5457d6f1123..00000000000
--- a/libjava/javax/swing/JSpinner.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner__
-#define __javax_swing_JSpinner__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JSpinner;
-        class SpinnerModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class SpinnerUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JSpinner : public ::javax::swing::JComponent
-{
-
-public:
-  JSpinner();
-  JSpinner(::javax::swing::SpinnerModel *);
-  virtual void commitEdit();
-  virtual ::javax::swing::JComponent * getEditor();
-  virtual void setEditor(::javax::swing::JComponent *);
-  virtual ::javax::swing::SpinnerModel * getModel();
-  virtual void setModel(::javax::swing::SpinnerModel *);
-  virtual ::java::lang::Object * getNextValue();
-  virtual ::java::lang::Object * getPreviousValue();
-  virtual ::javax::swing::plaf::SpinnerUI * getUI();
-  virtual ::java::lang::Object * getValue();
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void updateUI();
-  virtual void setUI(::javax::swing::plaf::SpinnerUI *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-  virtual ::javax::swing::JComponent * createEditor(::javax::swing::SpinnerModel *);
-private:
-  ::javax::swing::SpinnerModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) model;
-  ::javax::swing::JComponent * editor;
-  static const jlong serialVersionUID = 3412663575706551720LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner__
diff --git a/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h b/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h
deleted file mode 100644
index 3144301d52a..00000000000
--- a/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSplitPane$AccessibleJSplitPane__
-#define __javax_swing_JSplitPane$AccessibleJSplitPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JSplitPane;
-        class JSplitPane$AccessibleJSplitPane;
-    }
-  }
-}
-
-class javax::swing::JSplitPane$AccessibleJSplitPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JSplitPane$AccessibleJSplitPane(::javax::swing::JSplitPane *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -1788116871416305366LL;
-public: // actually package-private
-  ::javax::swing::JSplitPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSplitPane$AccessibleJSplitPane__
diff --git a/libjava/javax/swing/JSplitPane.h b/libjava/javax/swing/JSplitPane.h
deleted file mode 100644
index 31405bd8728..00000000000
--- a/libjava/javax/swing/JSplitPane.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSplitPane__
-#define __javax_swing_JSplitPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JSplitPane;
-      namespace plaf
-      {
-          class SplitPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JSplitPane : public ::javax::swing::JComponent
-{
-
-public:
-  JSplitPane(jint, jboolean, ::java::awt::Component *, ::java::awt::Component *);
-  JSplitPane(jint, ::java::awt::Component *, ::java::awt::Component *);
-  JSplitPane(jint, jboolean);
-  JSplitPane(jint);
-  JSplitPane();
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Component * getBottomComponent();
-  virtual jint getDividerLocation();
-  virtual jint getDividerSize();
-  virtual jint getLastDividerLocation();
-  virtual ::java::awt::Component * getLeftComponent();
-  virtual jint getMaximumDividerLocation();
-  virtual jint getMinimumDividerLocation();
-  virtual jint getOrientation();
-  virtual jdouble getResizeWeight();
-  virtual ::java::awt::Component * getRightComponent();
-  virtual ::java::awt::Component * getTopComponent();
-  virtual ::javax::swing::plaf::SplitPaneUI * getUI();
-  virtual jboolean isContinuousLayout();
-  virtual jboolean isOneTouchExpandable();
-  virtual jboolean isValidateRoot();
-public: // actually protected
-  virtual void paintChildren(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void remove(::java::awt::Component *);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual void resetToPreferredSizes();
-  virtual void setBottomComponent(::java::awt::Component *);
-  virtual void setContinuousLayout(jboolean);
-  virtual void setDividerLocation(jdouble);
-  virtual void setDividerLocation(jint);
-  virtual void setDividerSize(jint);
-  virtual void setLastDividerLocation(jint);
-  virtual void setLeftComponent(::java::awt::Component *);
-  virtual void setOneTouchExpandable(jboolean);
-  virtual void setOrientation(jint);
-  virtual void setResizeWeight(jdouble);
-  virtual void setRightComponent(::java::awt::Component *);
-  virtual void setTopComponent(::java::awt::Component *);
-  virtual void setUI(::javax::swing::plaf::SplitPaneUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -5634142046175988380LL;
-public:
-  static ::java::lang::String * BOTTOM;
-  static ::java::lang::String * CONTINUOUS_LAYOUT_PROPERTY;
-  static ::java::lang::String * DIVIDER;
-  static ::java::lang::String * DIVIDER_LOCATION_PROPERTY;
-  static ::java::lang::String * DIVIDER_SIZE_PROPERTY;
-  static const jint HORIZONTAL_SPLIT = 1;
-  static ::java::lang::String * LAST_DIVIDER_LOCATION_PROPERTY;
-  static ::java::lang::String * LEFT;
-  static ::java::lang::String * ONE_TOUCH_EXPANDABLE_PROPERTY;
-  static ::java::lang::String * ORIENTATION_PROPERTY;
-  static ::java::lang::String * RESIZE_WEIGHT_PROPERTY;
-  static ::java::lang::String * RIGHT;
-  static ::java::lang::String * TOP;
-  static const jint VERTICAL_SPLIT = 0;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) continuousLayout;
-  jboolean oneTouchExpandable;
-  jint dividerSize;
-  jint lastDividerLocation;
-  jint orientation;
-  ::java::awt::Component * leftComponent;
-  ::java::awt::Component * rightComponent;
-private:
-  jint dividerLocation;
-  jdouble resizeWeight;
-  jboolean clientDividerSizeSet;
-  jboolean clientOneTouchExpandableSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSplitPane__
diff --git a/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h b/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h
deleted file mode 100644
index 8769fad0477..00000000000
--- a/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTabbedPane$AccessibleJTabbedPane__
-#define __javax_swing_JTabbedPane$AccessibleJTabbedPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-    }
-    namespace swing
-    {
-        class JTabbedPane;
-        class JTabbedPane$AccessibleJTabbedPane;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTabbedPane$AccessibleJTabbedPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JTabbedPane$AccessibleJTabbedPane(::javax::swing::JTabbedPane *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-private:
-  static const jlong serialVersionUID = 7610530885966830483LL;
-public: // actually package-private
-  ::javax::swing::JTabbedPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTabbedPane$AccessibleJTabbedPane__
diff --git a/libjava/javax/swing/JTabbedPane$ModelListener.h b/libjava/javax/swing/JTabbedPane$ModelListener.h
deleted file mode 100644
index 04ffcc1961c..00000000000
--- a/libjava/javax/swing/JTabbedPane$ModelListener.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTabbedPane$ModelListener__
-#define __javax_swing_JTabbedPane$ModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTabbedPane;
-        class JTabbedPane$ModelListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTabbedPane$ModelListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  JTabbedPane$ModelListener(::javax::swing::JTabbedPane *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-private:
-  static const jlong serialVersionUID = 497359819958114132LL;
-public: // actually package-private
-  ::javax::swing::JTabbedPane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTabbedPane$ModelListener__
diff --git a/libjava/javax/swing/JTabbedPane$Page.h b/libjava/javax/swing/JTabbedPane$Page.h
deleted file mode 100644
index 346289a538b..00000000000
--- a/libjava/javax/swing/JTabbedPane$Page.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTabbedPane$Page__
-#define __javax_swing_JTabbedPane$Page__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JTabbedPane;
-        class JTabbedPane$Page;
-    }
-  }
-}
-
-class javax::swing::JTabbedPane$Page : public ::javax::accessibility::AccessibleContext
-{
-
-public: // actually protected
-  JTabbedPane$Page(::javax::swing::JTabbedPane *, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *);
-public:
-  virtual ::java::awt::Component * getComponent();
-  virtual void setComponent(::java::awt::Component *);
-  virtual ::java::lang::String * getTip();
-  virtual void setTip(::java::lang::String *);
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::lang::String * getTitle();
-  virtual void setTitle(::java::lang::String *);
-  virtual ::javax::swing::Icon * getIcon();
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getDisabledIcon();
-  virtual void setDisabledIcon(::javax::swing::Icon *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jint getMnemonic();
-  virtual void setMnemonic(jint);
-  virtual void setMnemonic(jchar);
-  virtual jint getDisplayedMnemonicIndex();
-  virtual void setDisplayedMnemonicIndex(jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) tip;
-  ::java::awt::Component * component;
-  ::javax::swing::Icon * icon;
-  ::javax::swing::Icon * disabledIcon;
-  jboolean enabled;
-  ::java::lang::String * title;
-  ::java::awt::Color * bg;
-  ::java::awt::Color * fg;
-  jint mnemonicKey;
-  jint underlinedChar;
-  static const jlong serialVersionUID = 1614381073220130939LL;
-public: // actually package-private
-  ::javax::swing::JTabbedPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTabbedPane$Page__
diff --git a/libjava/javax/swing/JTabbedPane.h b/libjava/javax/swing/JTabbedPane.h
deleted file mode 100644
index 8b286e5c1af..00000000000
--- a/libjava/javax/swing/JTabbedPane.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTabbedPane__
-#define __javax_swing_JTabbedPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Rectangle;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JTabbedPane;
-        class SingleSelectionModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class TabbedPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JTabbedPane : public ::javax::swing::JComponent
-{
-
-public:
-  JTabbedPane();
-  JTabbedPane(jint);
-  JTabbedPane(jint, jint);
-  virtual ::javax::swing::plaf::TabbedPaneUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TabbedPaneUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual ::javax::swing::SingleSelectionModel * getModel();
-  virtual void setModel(::javax::swing::SingleSelectionModel *);
-  virtual jint getTabPlacement();
-  virtual void setTabPlacement(jint);
-  virtual jint getTabLayoutPolicy();
-  virtual void setTabLayoutPolicy(jint);
-  virtual jint getSelectedIndex();
-private:
-  void checkIndex(jint, jint, jint);
-public:
-  virtual void setSelectedIndex(jint);
-  virtual ::java::awt::Component * getSelectedComponent();
-  virtual void setSelectedComponent(::java::awt::Component *);
-  virtual void insertTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *, jint);
-  virtual void addTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *);
-  virtual void addTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *);
-  virtual void addTab(::java::lang::String *, ::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::lang::String *, ::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::awt::Component *, jint);
-  virtual void add(::java::awt::Component *, ::java::lang::Object *);
-  virtual void add(::java::awt::Component *, ::java::lang::Object *, jint);
-  virtual void removeTabAt(jint);
-  virtual void remove(::java::awt::Component *);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual jint getTabCount();
-  virtual jint getTabRunCount();
-  virtual ::java::lang::String * getTitleAt(jint);
-  virtual ::javax::swing::Icon * getIconAt(jint);
-  virtual ::javax::swing::Icon * getDisabledIconAt(jint);
-  virtual ::java::lang::String * getToolTipTextAt(jint);
-  virtual ::java::awt::Color * getForegroundAt(jint);
-  virtual ::java::awt::Color * getBackgroundAt(jint);
-  virtual ::java::awt::Component * getComponentAt(jint);
-  virtual jboolean isEnabledAt(jint);
-  virtual jint getMnemonicAt(jint);
-  virtual jint getDisplayedMnemonicIndexAt(jint);
-  virtual ::java::awt::Rectangle * getBoundsAt(jint);
-  virtual void setTitleAt(jint, ::java::lang::String *);
-  virtual void setIconAt(jint, ::javax::swing::Icon *);
-  virtual void setDisabledIconAt(jint, ::javax::swing::Icon *);
-  virtual void setToolTipTextAt(jint, ::java::lang::String *);
-  virtual void setBackgroundAt(jint, ::java::awt::Color *);
-  virtual void setForegroundAt(jint, ::java::awt::Color *);
-  virtual void setEnabledAt(jint, jboolean);
-  virtual void setComponentAt(jint, ::java::awt::Component *);
-  virtual void setDisplayedMnemonicIndexAt(jint, jint);
-  virtual void setMnemonicAt(jint, jint);
-  virtual jint indexOfTab(::java::lang::String *);
-  virtual jint indexOfTab(::javax::swing::Icon *);
-  virtual jint indexOfComponent(::java::awt::Component *);
-  virtual jint indexAtLocation(jint, jint);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 1614381073220130939LL;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) changeEvent;
-  ::javax::swing::event::ChangeListener * changeListener;
-  ::javax::swing::SingleSelectionModel * model;
-public:
-  static const jint SCROLL_TAB_LAYOUT = 1;
-  static const jint WRAP_TAB_LAYOUT = 0;
-public: // actually protected
-  jint tabPlacement;
-private:
-  jint layoutPolicy;
-public: // actually package-private
-  ::java::util::Vector * tabs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTabbedPane__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h
deleted file mode 100644
index 0264034abc9..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
-#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JTable;
-        class JTable$AccessibleJTable;
-        class JTable$AccessibleJTable$AccessibleJTableCell;
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable$AccessibleJTableCell : public ::javax::accessibility::AccessibleContext
-{
-
-public:
-  JTable$AccessibleJTable$AccessibleJTableCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::JTable *, jint, jint, jint);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jboolean isFocusTraversable();
-  virtual void requestFocus();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-private:
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) table;
-  jint row;
-  jint column;
-  jint index;
-public: // actually package-private
-  ::javax::swing::JTable$AccessibleJTable * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h
deleted file mode 100644
index 2a7e6aa61af..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
-#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JTable$AccessibleJTable;
-        class JTable$AccessibleJTable$AccessibleJTableHeaderCell;
-      namespace table
-      {
-          class JTableHeader;
-      }
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable$AccessibleJTableHeaderCell : public ::javax::accessibility::AccessibleContext
-{
-
-  JTable$AccessibleJTable$AccessibleJTableHeaderCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::java::awt::Component *, jint, jint);
-public: // actually package-private
-  virtual ::java::awt::Component * getColumnHeaderRenderer();
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jboolean isFocusTraversable();
-  virtual void requestFocus();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-public: // actually package-private
-  JTable$AccessibleJTable$AccessibleJTableHeaderCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::java::awt::Component *, jint, jint, ::javax::swing::JTable$AccessibleJTable$AccessibleJTableHeaderCell *);
-  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) header;
-  jint columnIndex;
-  ::javax::swing::JTable$AccessibleJTable * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h
deleted file mode 100644
index 256910ef678..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
-#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable$AccessibleJTable;
-        class JTable$AccessibleJTable$AccessibleJTableModelChange;
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable$AccessibleJTableModelChange : public ::java::lang::Object
-{
-
-public: // actually protected
-  JTable$AccessibleJTable$AccessibleJTableModelChange(::javax::swing::JTable$AccessibleJTable *, jint, jint, jint, jint, jint);
-public:
-  virtual jint getType();
-  virtual jint getFirstRow();
-  virtual jint getLastRow();
-  virtual jint getFirstColumn();
-  virtual jint getLastColumn();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jint firstRow;
-  jint lastRow;
-  jint firstColumn;
-  jint lastColumn;
-public: // actually package-private
-  ::javax::swing::JTable$AccessibleJTable * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h
deleted file mode 100644
index 64e8a51143e..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
-#define __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleTable;
-    }
-    namespace swing
-    {
-        class JTable$AccessibleJTable;
-        class JTable$AccessibleJTable$AccessibleTableHeader;
-      namespace table
-      {
-          class JTableHeader;
-      }
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable$AccessibleTableHeader : public ::java::lang::Object
-{
-
-  JTable$AccessibleJTable$AccessibleTableHeader(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *);
-public:
-  virtual ::javax::accessibility::Accessible * getAccessibleCaption();
-  virtual void setAccessibleCaption(::javax::accessibility::Accessible *);
-  virtual ::javax::accessibility::Accessible * getAccessibleSummary();
-  virtual void setAccessibleSummary(::javax::accessibility::Accessible *);
-  virtual jint getAccessibleRowCount();
-  virtual jint getAccessibleColumnCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint);
-  virtual jint getAccessibleRowExtentAt(jint, jint);
-  virtual jint getAccessibleColumnExtentAt(jint, jint);
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader();
-  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *);
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader();
-  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *);
-  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint);
-  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *);
-  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint);
-  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *);
-  virtual jboolean isAccessibleSelected(jint, jint);
-  virtual jboolean isAccessibleRowSelected(jint);
-  virtual jboolean isAccessibleColumnSelected(jint);
-  virtual JArray< jint > * getSelectedAccessibleRows();
-  virtual JArray< jint > * getSelectedAccessibleColumns();
-public: // actually package-private
-  JTable$AccessibleJTable$AccessibleTableHeader(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::javax::swing::JTable$AccessibleJTable$AccessibleTableHeader *);
-private:
-  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) header;
-public: // actually package-private
-  ::javax::swing::JTable$AccessibleJTable * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable.h b/libjava/javax/swing/JTable$AccessibleJTable.h
deleted file mode 100644
index 71cb86b68e1..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable__
-#define __javax_swing_JTable$AccessibleJTable__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleTable;
-    }
-    namespace swing
-    {
-        class JTable;
-        class JTable$AccessibleJTable;
-      namespace event
-      {
-          class ChangeEvent;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-          class TableModelEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JTable$AccessibleJTable(::javax::swing::JTable *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleTable();
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void tableChanged(::javax::swing::event::TableModelEvent *);
-  virtual void tableRowsInserted(::javax::swing::event::TableModelEvent *);
-  virtual void tableRowsDeleted(::javax::swing::event::TableModelEvent *);
-private:
-  void handleRowChange(::javax::swing::event::TableModelEvent *);
-public:
-  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
-private:
-  void handleColumnChange(jint, jint, jint);
-public:
-  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
-  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual jint getAccessibleRow(jint);
-  virtual jint getAccessibleColumn(jint);
-  virtual jint getAccessibleIndex(jint, jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleCaption();
-  virtual void setAccessibleCaption(::javax::accessibility::Accessible *);
-  virtual ::javax::accessibility::Accessible * getAccessibleSummary();
-  virtual void setAccessibleSummary(::javax::accessibility::Accessible *);
-  virtual jint getAccessibleRowCount();
-  virtual jint getAccessibleColumnCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint);
-  virtual jint getAccessibleRowExtentAt(jint, jint);
-  virtual jint getAccessibleColumnExtentAt(jint, jint);
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader();
-  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *);
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader();
-  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *);
-  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint);
-  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *);
-  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint);
-  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *);
-  virtual jboolean isAccessibleSelected(jint, jint);
-  virtual jboolean isAccessibleRowSelected(jint);
-  virtual jboolean isAccessibleColumnSelected(jint);
-  virtual JArray< jint > * getSelectedAccessibleRows();
-  virtual JArray< jint > * getSelectedAccessibleColumns();
-  virtual jint getAccessibleRowAtIndex(jint);
-  virtual jint getAccessibleColumnAtIndex(jint);
-  virtual jint getAccessibleIndexAt(jint, jint);
-public: // actually package-private
-  static ::javax::swing::JTable * access$0(::javax::swing::JTable$AccessibleJTable *);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) lastSelectedRow;
-  jint lastSelectedColumn;
-  ::javax::accessibility::Accessible * caption;
-  ::javax::accessibility::Accessible * summary;
-  JArray< ::javax::accessibility::Accessible * > * rowDescriptions;
-  JArray< ::javax::accessibility::Accessible * > * columnDescriptions;
-public: // actually package-private
-  ::javax::swing::JTable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable__
diff --git a/libjava/javax/swing/JTable$BooleanCellRenderer.h b/libjava/javax/swing/JTable$BooleanCellRenderer.h
deleted file mode 100644
index 127540b10ae..00000000000
--- a/libjava/javax/swing/JTable$BooleanCellRenderer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$BooleanCellRenderer__
-#define __javax_swing_JTable$BooleanCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JCheckBox;
-        class JTable;
-        class JTable$BooleanCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$BooleanCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public: // actually package-private
-  JTable$BooleanCellRenderer(::javax::swing::JTable *);
-  virtual ::javax::swing::JCheckBox * getCheckBox();
-public:
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-private:
-  ::javax::swing::JCheckBox * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) checkBox;
-public: // actually package-private
-  ::javax::swing::JTable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$BooleanCellRenderer__
diff --git a/libjava/javax/swing/JTable$DateCellRenderer.h b/libjava/javax/swing/JTable$DateCellRenderer.h
deleted file mode 100644
index 854751c30bc..00000000000
--- a/libjava/javax/swing/JTable$DateCellRenderer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$DateCellRenderer__
-#define __javax_swing_JTable$DateCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$DateCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$DateCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-  JTable$DateCellRenderer(::javax::swing::JTable *);
-public:
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  JTable$DateCellRenderer(::javax::swing::JTable *, ::javax::swing::JTable$DateCellRenderer *);
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$DateCellRenderer__
diff --git a/libjava/javax/swing/JTable$DoubleCellRenderer.h b/libjava/javax/swing/JTable$DoubleCellRenderer.h
deleted file mode 100644
index 7b3ef733c66..00000000000
--- a/libjava/javax/swing/JTable$DoubleCellRenderer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$DoubleCellRenderer__
-#define __javax_swing_JTable$DoubleCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$DoubleCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$DoubleCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  JTable$DoubleCellRenderer(::javax::swing::JTable *);
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$DoubleCellRenderer__
diff --git a/libjava/javax/swing/JTable$FloatCellRenderer.h b/libjava/javax/swing/JTable$FloatCellRenderer.h
deleted file mode 100644
index b53038046e7..00000000000
--- a/libjava/javax/swing/JTable$FloatCellRenderer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$FloatCellRenderer__
-#define __javax_swing_JTable$FloatCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$FloatCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$FloatCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  JTable$FloatCellRenderer(::javax::swing::JTable *);
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$FloatCellRenderer__
diff --git a/libjava/javax/swing/JTable$IconCellRenderer.h b/libjava/javax/swing/JTable$IconCellRenderer.h
deleted file mode 100644
index 6b7556658db..00000000000
--- a/libjava/javax/swing/JTable$IconCellRenderer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$IconCellRenderer__
-#define __javax_swing_JTable$IconCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$IconCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$IconCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public: // actually package-private
-  JTable$IconCellRenderer(::javax::swing::JTable *);
-public:
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$IconCellRenderer__
diff --git a/libjava/javax/swing/JTable$NumberCellRenderer.h b/libjava/javax/swing/JTable$NumberCellRenderer.h
deleted file mode 100644
index 4b51472577d..00000000000
--- a/libjava/javax/swing/JTable$NumberCellRenderer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$NumberCellRenderer__
-#define __javax_swing_JTable$NumberCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$NumberCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$NumberCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  JTable$NumberCellRenderer(::javax::swing::JTable *);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$NumberCellRenderer__
diff --git a/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h b/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h
deleted file mode 100644
index dc512796b9f..00000000000
--- a/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$TableColumnPropertyChangeHandler__
-#define __javax_swing_JTable$TableColumnPropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$TableColumnPropertyChangeHandler;
-    }
-  }
-}
-
-class javax::swing::JTable$TableColumnPropertyChangeHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JTable$TableColumnPropertyChangeHandler(::javax::swing::JTable *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$TableColumnPropertyChangeHandler__
diff --git a/libjava/javax/swing/JTable$TableTextField.h b/libjava/javax/swing/JTable$TableTextField.h
deleted file mode 100644
index c0c118f7c77..00000000000
--- a/libjava/javax/swing/JTable$TableTextField.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$TableTextField__
-#define __javax_swing_JTable$TableTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$TableTextField;
-    }
-  }
-}
-
-class javax::swing::JTable$TableTextField : public ::javax::swing::JTextField
-{
-
-public: // actually package-private
-  JTable$TableTextField(::javax::swing::JTable *);
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$TableTextField__
diff --git a/libjava/javax/swing/JTable.h b/libjava/javax/swing/JTable.h
deleted file mode 100644
index 09feb7f226b..00000000000
--- a/libjava/javax/swing/JTable.h
+++ /dev/null
@@ -1,294 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable__
-#define __javax_swing_JTable__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JScrollPane;
-        class JTable;
-        class JTable$TableColumnPropertyChangeHandler;
-        class ListSelectionModel;
-        class SizeSequence;
-      namespace event
-      {
-          class ChangeEvent;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-          class TableModelEvent;
-      }
-      namespace plaf
-      {
-          class TableUI;
-      }
-      namespace table
-      {
-          class JTableHeader;
-          class TableCellEditor;
-          class TableCellRenderer;
-          class TableColumn;
-          class TableColumnModel;
-          class TableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::JTable : public ::javax::swing::JComponent
-{
-
-public:
-  JTable();
-  JTable(jint, jint);
-  JTable(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
-  JTable(::javax::swing::table::TableModel *);
-  JTable(::javax::swing::table::TableModel *, ::javax::swing::table::TableColumnModel *);
-  JTable(::javax::swing::table::TableModel *, ::javax::swing::table::TableColumnModel *, ::javax::swing::ListSelectionModel *);
-  JTable(::java::util::Vector *, ::java::util::Vector *);
-public: // actually protected
-  virtual void initializeLocalVars();
-public:
-  virtual void addColumn(::javax::swing::table::TableColumn *);
-public: // actually protected
-  virtual void createDefaultEditors();
-  virtual void createDefaultRenderers();
-public:
-  static ::javax::swing::JScrollPane * createScrollPaneForTable(::javax::swing::JTable *);
-public: // actually protected
-  virtual ::javax::swing::table::TableColumnModel * createDefaultColumnModel();
-  virtual ::javax::swing::table::TableModel * createDefaultDataModel();
-  virtual ::javax::swing::ListSelectionModel * createDefaultSelectionModel();
-  virtual ::javax::swing::table::JTableHeader * createDefaultTableHeader();
-public:
-  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
-  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
-  virtual void tableChanged(::javax::swing::event::TableModelEvent *);
-private:
-  void handleCompleteChange(::javax::swing::event::TableModelEvent *);
-  void handleInsert(::javax::swing::event::TableModelEvent *);
-  void handleDelete(::javax::swing::event::TableModelEvent *);
-  void handleUpdate(::javax::swing::event::TableModelEvent *);
-  void checkSelection();
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual jint columnAtPoint(::java::awt::Point *);
-  virtual jint rowAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCellRect(jint, jint, jboolean);
-  virtual void clearSelection();
-  virtual jint getSelectedRow();
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual ::javax::swing::table::TableCellEditor * getCellEditor(jint, jint);
-  virtual ::javax::swing::table::TableCellEditor * getDefaultEditor(::java::lang::Class *);
-  virtual ::javax::swing::table::TableCellRenderer * getCellRenderer(jint, jint);
-  virtual void setDefaultRenderer(::java::lang::Class *, ::javax::swing::table::TableCellRenderer *);
-  virtual ::javax::swing::table::TableCellRenderer * getDefaultRenderer(::java::lang::Class *);
-  virtual jint convertColumnIndexToModel(jint);
-  virtual jint convertColumnIndexToView(jint);
-  virtual ::java::awt::Component * prepareRenderer(::javax::swing::table::TableCellRenderer *, jint, jint);
-  virtual jboolean getAutoCreateColumnsFromModel();
-  virtual jint getAutoResizeMode();
-  virtual jint getRowHeight();
-  virtual jint getRowHeight(jint);
-  virtual jint getRowMargin();
-  virtual jboolean getRowSelectionAllowed();
-  virtual jboolean getCellSelectionEnabled();
-  virtual ::javax::swing::table::TableModel * getModel();
-  virtual jint getColumnCount();
-  virtual jint getRowCount();
-  virtual ::javax::swing::table::TableColumnModel * getColumnModel();
-  virtual jint getSelectedColumn();
-private:
-  static jint countSelections(::javax::swing::ListSelectionModel *);
-  static JArray< jint > * getSelections(::javax::swing::ListSelectionModel *);
-public:
-  virtual jint getSelectedColumnCount();
-  virtual JArray< jint > * getSelectedColumns();
-  virtual jboolean getColumnSelectionAllowed();
-  virtual jint getSelectedRowCount();
-  virtual JArray< jint > * getSelectedRows();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::table::TableCellEditor * getCellEditor();
-  virtual jboolean getDragEnabled();
-  virtual ::java::awt::Color * getGridColor();
-  virtual ::java::awt::Dimension * getIntercellSpacing();
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual ::java::awt::Color * getSelectionBackground();
-  virtual ::java::awt::Color * getSelectionForeground();
-  virtual jboolean getShowHorizontalLines();
-  virtual jboolean getShowVerticalLines();
-  virtual ::javax::swing::table::JTableHeader * getTableHeader();
-  virtual void removeColumn(::javax::swing::table::TableColumn *);
-  virtual void moveColumn(jint, jint);
-  virtual void setAutoCreateColumnsFromModel(jboolean);
-  virtual void setAutoResizeMode(jint);
-  virtual void setRowHeight(jint);
-  virtual void setRowHeight(jint, jint);
-  virtual void setRowMargin(jint);
-  virtual void setRowSelectionAllowed(jboolean);
-  virtual void setCellSelectionEnabled(jboolean);
-  virtual void setModel(::javax::swing::table::TableModel *);
-  virtual void setColumnModel(::javax::swing::table::TableColumnModel *);
-  virtual void setColumnSelectionAllowed(jboolean);
-  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
-  virtual void setSelectionMode(jint);
-  virtual void setCellEditor(::javax::swing::table::TableCellEditor *);
-  virtual void setDragEnabled(jboolean);
-  virtual void setGridColor(::java::awt::Color *);
-  virtual void setIntercellSpacing(::java::awt::Dimension *);
-  virtual void setPreferredScrollableViewportSize(::java::awt::Dimension *);
-  virtual void setSelectionBackground(::java::awt::Color *);
-  virtual void setSelectionForeground(::java::awt::Color *);
-  virtual void setShowGrid(jboolean);
-  virtual void setShowHorizontalLines(jboolean);
-  virtual void setShowVerticalLines(jboolean);
-  virtual void setTableHeader(::javax::swing::table::JTableHeader *);
-public: // actually protected
-  virtual void configureEnclosingScrollPane();
-  virtual void unconfigureEnclosingScrollPane();
-public:
-  virtual void addNotify();
-  virtual void removeNotify();
-private:
-  void distributeSpill(JArray< ::javax::swing::table::TableColumn * > *, jint);
-  void distributeSpillResizing(JArray< ::javax::swing::table::TableColumn * > *, jint, ::javax::swing::table::TableColumn *);
-public:
-  virtual void doLayout();
-public: // actually package-private
-  virtual jint getLeftResizingBoundary();
-public:
-  virtual void sizeColumnsToFit(jboolean);
-  virtual void sizeColumnsToFit(jint);
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::plaf::TableUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TableUI *);
-  virtual void updateUI();
-  virtual ::java::lang::Class * getColumnClass(jint);
-  virtual ::java::lang::String * getColumnName(jint);
-  virtual jint getEditingColumn();
-  virtual void setEditingColumn(jint);
-  virtual jint getEditingRow();
-  virtual void setEditingRow(jint);
-  virtual ::java::awt::Component * getEditorComponent();
-  virtual jboolean isEditing();
-  virtual void setDefaultEditor(::java::lang::Class *, ::javax::swing::table::TableCellEditor *);
-  virtual void addColumnSelectionInterval(jint, jint);
-  virtual void addRowSelectionInterval(jint, jint);
-  virtual void setColumnSelectionInterval(jint, jint);
-  virtual void setRowSelectionInterval(jint, jint);
-  virtual void removeColumnSelectionInterval(jint, jint);
-  virtual void removeRowSelectionInterval(jint, jint);
-  virtual jboolean isColumnSelected(jint);
-  virtual jboolean isRowSelected(jint);
-  virtual jboolean isCellSelected(jint, jint);
-  virtual void selectAll();
-  virtual ::java::lang::Object * getValueAt(jint, jint);
-  virtual void setValueAt(::java::lang::Object *, jint, jint);
-  virtual ::javax::swing::table::TableColumn * getColumn(::java::lang::Object *);
-  virtual jboolean isCellEditable(jint, jint);
-  virtual void createDefaultColumnsFromModel();
-  virtual void changeSelection(jint, jint, jboolean, jboolean);
-  virtual jboolean editCellAt(jint, jint);
-private:
-  void moveToCellBeingEdited(::java::awt::Component *);
-public:
-  virtual jboolean editCellAt(jint, jint, ::java::util::EventObject *);
-  virtual void removeEditor();
-  virtual ::java::awt::Component * prepareEditor(::javax::swing::table::TableCellEditor *, jint, jint);
-public: // actually protected
-  virtual void resizeAndRepaint();
-public:
-  virtual void setSurrendersFocusOnKeystroke(jboolean);
-  virtual jboolean getSurrendersFocusOnKeystroke();
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 3876025080382781659LL;
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) this_table;
-public:
-  static const jint AUTO_RESIZE_OFF = 0;
-  static const jint AUTO_RESIZE_NEXT_COLUMN = 1;
-  static const jint AUTO_RESIZE_SUBSEQUENT_COLUMNS = 2;
-  static const jint AUTO_RESIZE_ALL_COLUMNS = 4;
-  static const jint AUTO_RESIZE_LAST_COLUMN = 3;
-public: // actually protected
-  ::java::util::Hashtable * defaultEditorsByColumnClass;
-  ::java::util::Hashtable * defaultRenderersByColumnClass;
-  jint editingColumn;
-  jint editingRow;
-  ::java::awt::Component * editorComp;
-  jboolean autoCreateColumnsFromModel;
-  jint autoResizeMode;
-  jint rowHeight;
-  jint rowMargin;
-  jboolean rowSelectionAllowed;
-  jboolean cellSelectionEnabled;
-  ::javax::swing::table::TableModel * dataModel;
-  ::javax::swing::table::TableColumnModel * columnModel;
-  ::javax::swing::ListSelectionModel * selectionModel;
-  ::javax::swing::table::TableCellEditor * cellEditor;
-private:
-  jboolean dragEnabled;
-public: // actually protected
-  ::java::awt::Color * gridColor;
-  ::java::awt::Dimension * preferredViewportSize;
-  ::java::awt::Color * selectionBackground;
-private:
-  static ::java::lang::String * SELECTION_BACKGROUND_CHANGED_PROPERTY;
-public: // actually protected
-  ::java::awt::Color * selectionForeground;
-private:
-  static ::java::lang::String * SELECTION_FOREGROUND_CHANGED_PROPERTY;
-public: // actually protected
-  jboolean showHorizontalLines;
-  jboolean showVerticalLines;
-  ::javax::swing::table::JTableHeader * tableHeader;
-public: // actually package-private
-  ::javax::swing::JTable$TableColumnPropertyChangeHandler * tableColumnPropertyChangeHandler;
-private:
-  jboolean surrendersFocusOnKeystroke;
-  ::java::awt::Rectangle * rectCache;
-  jboolean clientRowHeightSet;
-  ::javax::swing::SizeSequence * rowHeights;
-  ::javax::swing::table::TableCellEditor * booleanInvertingEditor;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable__
diff --git a/libjava/javax/swing/JTextArea$AccessibleJTextArea.h b/libjava/javax/swing/JTextArea$AccessibleJTextArea.h
deleted file mode 100644
index 57d5b20fcf0..00000000000
--- a/libjava/javax/swing/JTextArea$AccessibleJTextArea.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextArea$AccessibleJTextArea__
-#define __javax_swing_JTextArea$AccessibleJTextArea__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JTextArea;
-        class JTextArea$AccessibleJTextArea;
-    }
-  }
-}
-
-class javax::swing::JTextArea$AccessibleJTextArea : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
-{
-
-public: // actually protected
-  JTextArea$AccessibleJTextArea(::javax::swing::JTextArea *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-public: // actually package-private
-  ::javax::swing::JTextArea * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextArea$AccessibleJTextArea__
diff --git a/libjava/javax/swing/JTextArea.h b/libjava/javax/swing/JTextArea.h
deleted file mode 100644
index c5248b94bb9..00000000000
--- a/libjava/javax/swing/JTextArea.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextArea__
-#define __javax_swing_JTextArea__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JTextArea;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JTextArea : public ::javax::swing::text::JTextComponent
-{
-
-public:
-  JTextArea();
-  JTextArea(::java::lang::String *);
-  JTextArea(jint, jint);
-  JTextArea(::java::lang::String *, jint, jint);
-  JTextArea(::javax::swing::text::Document *);
-  JTextArea(::javax::swing::text::Document *, ::java::lang::String *, jint, jint);
-  virtual void append(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::text::Document * createDefaultModel();
-public:
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jint getColumns();
-  virtual void setColumns(jint);
-  virtual jint getRows();
-  virtual void setRows(jint);
-  virtual jboolean getLineWrap();
-  virtual void setLineWrap(jboolean);
-  virtual jboolean getWrapStyleWord();
-  virtual void setWrapStyleWord(jboolean);
-  virtual jint getTabSize();
-  virtual void setTabSize(jint);
-public: // actually protected
-  virtual jint getColumnWidth();
-public:
-  virtual jint getLineCount();
-  virtual jint getLineStartOffset(jint);
-  virtual jint getLineEndOffset(jint);
-  virtual jint getLineOfOffset(jint);
-public: // actually protected
-  virtual jint getRowHeight();
-public:
-  virtual void insert(::java::lang::String *, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -6141680179310439825LL;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) rows;
-  jint columns;
-  jboolean lineWrap;
-  jint tabSize;
-  jboolean wrapStyleWord;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextArea__
diff --git a/libjava/javax/swing/JTextField$1.h b/libjava/javax/swing/JTextField$1.h
deleted file mode 100644
index 8e2220f21ff..00000000000
--- a/libjava/javax/swing/JTextField$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextField$1__
-#define __javax_swing_JTextField$1__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTextField$1;
-    }
-  }
-}
-
-class javax::swing::JTextField$1 : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  JTextField$1(::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextField$1__
diff --git a/libjava/javax/swing/JTextField$2.h b/libjava/javax/swing/JTextField$2.h
deleted file mode 100644
index b8587d17c4d..00000000000
--- a/libjava/javax/swing/JTextField$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextField$2__
-#define __javax_swing_JTextField$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTextField;
-        class JTextField$2;
-    }
-  }
-}
-
-class javax::swing::JTextField$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JTextField$2(::javax::swing::JTextField *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextField$2__
diff --git a/libjava/javax/swing/JTextField$AccessibleJTextField.h b/libjava/javax/swing/JTextField$AccessibleJTextField.h
deleted file mode 100644
index 403fcae20e5..00000000000
--- a/libjava/javax/swing/JTextField$AccessibleJTextField.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextField$AccessibleJTextField__
-#define __javax_swing_JTextField$AccessibleJTextField__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JTextField;
-        class JTextField$AccessibleJTextField;
-    }
-  }
-}
-
-class javax::swing::JTextField$AccessibleJTextField : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
-{
-
-public: // actually protected
-  JTextField$AccessibleJTextField(::javax::swing::JTextField *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 8255147276740453036LL;
-public: // actually package-private
-  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextField$AccessibleJTextField__
diff --git a/libjava/javax/swing/JTextField.h b/libjava/javax/swing/JTextField.h
deleted file mode 100644
index de4ed3ab823..00000000000
--- a/libjava/javax/swing/JTextField.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextField__
-#define __javax_swing_JTextField__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Font;
-        class Rectangle;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class BoundedRangeModel;
-        class JTextField;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JTextField : public ::javax::swing::text::JTextComponent
-{
-
-public:
-  JTextField();
-  JTextField(::java::lang::String *);
-  JTextField(jint);
-  JTextField(::java::lang::String *, jint);
-  JTextField(::javax::swing::text::Document *, ::java::lang::String *, jint);
-public: // actually protected
-  virtual ::javax::swing::text::Document * createDefaultModel();
-public:
-  virtual void setDocument(::javax::swing::text::Document *);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-public: // actually protected
-  virtual void fireActionPerformed();
-public:
-  virtual jint getColumns();
-  virtual void setColumns(jint);
-  virtual jint getHorizontalAlignment();
-  virtual void setHorizontalAlignment(jint);
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual jint getScrollOffset();
-  virtual void setScrollOffset(jint);
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual void postActionEvent();
-  virtual ::javax::swing::Action * getAction();
-  virtual void setAction(::javax::swing::Action *);
-  virtual void setActionCommand(::java::lang::String *);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-  virtual jint getColumnWidth();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::BoundedRangeModel * getHorizontalVisibility();
-  virtual jboolean isValidateRoot();
-  virtual void scrollRectToVisible(::java::awt::Rectangle *);
-private:
-  static const jlong serialVersionUID = 353853209832607592LL;
-  static JArray< ::javax::swing::Action * > * actions;
-public:
-  static ::java::lang::String * notifyAction;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) columns;
-  jint align;
-  ::javax::swing::Action * action;
-  ::java::lang::String * actionCommand;
-  ::java::beans::PropertyChangeListener * actionPropertyChangeListener;
-  ::javax::swing::BoundedRangeModel * horizontalVisibility;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextField__
diff --git a/libjava/javax/swing/JTextPane.h b/libjava/javax/swing/JTextPane.h
deleted file mode 100644
index dcc6f7da788..00000000000
--- a/libjava/javax/swing/JTextPane.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextPane__
-#define __javax_swing_JTextPane__
-
-#pragma interface
-
-#include <javax/swing/JEditorPane.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JTextPane;
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class EditorKit;
-          class MutableAttributeSet;
-          class Style;
-          class StyledDocument;
-          class StyledEditorKit;
-      }
-    }
-  }
-}
-
-class javax::swing::JTextPane : public ::javax::swing::JEditorPane
-{
-
-public:
-  JTextPane();
-  JTextPane(::javax::swing::text::StyledDocument *);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setDocument(::javax::swing::text::Document *);
-  virtual ::javax::swing::text::StyledDocument * getStyledDocument();
-  virtual void setStyledDocument(::javax::swing::text::StyledDocument *);
-  virtual void replaceSelection(::java::lang::String *);
-  virtual void insertComponent(::java::awt::Component *);
-  virtual void insertIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
-  virtual void removeStyle(::java::lang::String *);
-  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
-  virtual ::javax::swing::text::Style * getLogicalStyle();
-  virtual void setLogicalStyle(::javax::swing::text::Style *);
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttributes();
-  virtual void setCharacterAttributes(::javax::swing::text::AttributeSet *, jboolean);
-  virtual ::javax::swing::text::AttributeSet * getParagraphAttributes();
-  virtual void setParagraphAttributes(::javax::swing::text::AttributeSet *, jboolean);
-  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
-public: // actually protected
-  virtual ::javax::swing::text::StyledEditorKit * getStyledEditorKit();
-  virtual ::javax::swing::text::EditorKit * createDefaultEditorKit();
-public:
-  virtual void setEditorKit(::javax::swing::text::EditorKit *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextPane__
diff --git a/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h b/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h
deleted file mode 100644
index a1f01f3378a..00000000000
--- a/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToggleButton$AccessibleJToggleButton__
-#define __javax_swing_JToggleButton$AccessibleJToggleButton__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JToggleButton;
-        class JToggleButton$AccessibleJToggleButton;
-    }
-  }
-}
-
-class javax::swing::JToggleButton$AccessibleJToggleButton : public ::javax::swing::AbstractButton$AccessibleAbstractButton
-{
-
-public:
-  JToggleButton$AccessibleJToggleButton(::javax::swing::JToggleButton *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-private:
-  static const jlong serialVersionUID = -8652952712161229225LL;
-public: // actually package-private
-  ::javax::swing::JToggleButton * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToggleButton$AccessibleJToggleButton__
diff --git a/libjava/javax/swing/JToggleButton$ToggleButtonModel.h b/libjava/javax/swing/JToggleButton$ToggleButtonModel.h
deleted file mode 100644
index a8d3c22595d..00000000000
--- a/libjava/javax/swing/JToggleButton$ToggleButtonModel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToggleButton$ToggleButtonModel__
-#define __javax_swing_JToggleButton$ToggleButtonModel__
-
-#pragma interface
-
-#include <javax/swing/DefaultButtonModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToggleButton$ToggleButtonModel;
-    }
-  }
-}
-
-class javax::swing::JToggleButton$ToggleButtonModel : public ::javax::swing::DefaultButtonModel
-{
-
-public:
-  JToggleButton$ToggleButtonModel();
-  virtual void setPressed(jboolean);
-  virtual jboolean isSelected();
-  virtual void setSelected(jboolean);
-private:
-  static const jlong serialVersionUID = -1589950750899943974LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToggleButton$ToggleButtonModel__
diff --git a/libjava/javax/swing/JToggleButton.h b/libjava/javax/swing/JToggleButton.h
deleted file mode 100644
index 88f281ac5ee..00000000000
--- a/libjava/javax/swing/JToggleButton.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToggleButton__
-#define __javax_swing_JToggleButton__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JToggleButton;
-    }
-  }
-}
-
-class javax::swing::JToggleButton : public ::javax::swing::AbstractButton
-{
-
-public:
-  JToggleButton();
-  JToggleButton(::javax::swing::Action *);
-  JToggleButton(::javax::swing::Icon *);
-  JToggleButton(::javax::swing::Icon *, jboolean);
-  JToggleButton(::java::lang::String *);
-  JToggleButton(::java::lang::String *, jboolean);
-  JToggleButton(::java::lang::String *, ::javax::swing::Icon *);
-  JToggleButton(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = -3128248873429850443LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToggleButton__
diff --git a/libjava/javax/swing/JToolBar$AccessibleJToolBar.h b/libjava/javax/swing/JToolBar$AccessibleJToolBar.h
deleted file mode 100644
index 0474a4e9183..00000000000
--- a/libjava/javax/swing/JToolBar$AccessibleJToolBar.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolBar$AccessibleJToolBar__
-#define __javax_swing_JToolBar$AccessibleJToolBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JToolBar;
-        class JToolBar$AccessibleJToolBar;
-    }
-  }
-}
-
-class javax::swing::JToolBar$AccessibleJToolBar : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JToolBar$AccessibleJToolBar(::javax::swing::JToolBar *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -5516888265903814215LL;
-public: // actually package-private
-  ::javax::swing::JToolBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolBar$AccessibleJToolBar__
diff --git a/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h b/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h
deleted file mode 100644
index ba7d9cc5239..00000000000
--- a/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolBar$DefaultToolBarLayout__
-#define __javax_swing_JToolBar$DefaultToolBarLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToolBar;
-        class JToolBar$DefaultToolBarLayout;
-    }
-  }
-}
-
-class javax::swing::JToolBar$DefaultToolBarLayout : public ::java::lang::Object
-{
-
-  JToolBar$DefaultToolBarLayout(::javax::swing::JToolBar *);
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  JToolBar$DefaultToolBarLayout(::javax::swing::JToolBar *, ::javax::swing::JToolBar$DefaultToolBarLayout *);
-  ::javax::swing::JToolBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolBar$DefaultToolBarLayout__
diff --git a/libjava/javax/swing/JToolBar$Separator.h b/libjava/javax/swing/JToolBar$Separator.h
deleted file mode 100644
index a30fc4e273a..00000000000
--- a/libjava/javax/swing/JToolBar$Separator.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolBar$Separator__
-#define __javax_swing_JToolBar$Separator__
-
-#pragma interface
-
-#include <javax/swing/JSeparator.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToolBar$Separator;
-    }
-  }
-}
-
-class javax::swing::JToolBar$Separator : public ::javax::swing::JSeparator
-{
-
-public:
-  JToolBar$Separator();
-  JToolBar$Separator(::java::awt::Dimension *);
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getSeparatorSize();
-  virtual void setSeparatorSize(::java::awt::Dimension *);
-private:
-  static const jlong serialVersionUID = -1656745644823105219LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolBar$Separator__
diff --git a/libjava/javax/swing/JToolBar.h b/libjava/javax/swing/JToolBar.h
deleted file mode 100644
index ea7cd99b27e..00000000000
--- a/libjava/javax/swing/JToolBar.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolBar__
-#define __javax_swing_JToolBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class JButton;
-        class JToolBar;
-      namespace plaf
-      {
-          class ToolBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JToolBar : public ::javax::swing::JComponent
-{
-
-public:
-  JToolBar();
-  JToolBar(jint);
-  JToolBar(::java::lang::String *);
-  JToolBar(::java::lang::String *, jint);
-  virtual ::javax::swing::JButton * add(::javax::swing::Action *);
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-public:
-  virtual ::javax::swing::plaf::ToolBarUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ToolBarUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setRollover(jboolean);
-  virtual jboolean isRollover();
-  virtual jint getComponentIndex(::java::awt::Component *);
-  virtual ::java::awt::Component * getComponentAtIndex(jint);
-  virtual ::java::awt::Insets * getMargin();
-  virtual void setMargin(::java::awt::Insets *);
-  virtual jboolean isBorderPainted();
-  virtual void setBorderPainted(jboolean);
-  virtual jboolean isFloatable();
-  virtual void setFloatable(jboolean);
-  virtual jint getOrientation();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setOrientation(jint);
-  virtual void addSeparator();
-  virtual void addSeparator(::java::awt::Dimension *);
-public: // actually protected
-  virtual ::javax::swing::JButton * createActionComponent(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JButton *);
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -1269915519555129643LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) paintBorder__;
-  ::java::awt::Insets * margin;
-  jboolean floatable;
-  jboolean rollover;
-  jint orientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolBar__
diff --git a/libjava/javax/swing/JToolTip$AccessibleJToolTip.h b/libjava/javax/swing/JToolTip$AccessibleJToolTip.h
deleted file mode 100644
index f65575e8aac..00000000000
--- a/libjava/javax/swing/JToolTip$AccessibleJToolTip.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolTip$AccessibleJToolTip__
-#define __javax_swing_JToolTip$AccessibleJToolTip__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JToolTip;
-        class JToolTip$AccessibleJToolTip;
-    }
-  }
-}
-
-class javax::swing::JToolTip$AccessibleJToolTip : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JToolTip$AccessibleJToolTip(::javax::swing::JToolTip *);
-public:
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -6222548177795408476LL;
-public: // actually package-private
-  ::javax::swing::JToolTip * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolTip$AccessibleJToolTip__
diff --git a/libjava/javax/swing/JToolTip.h b/libjava/javax/swing/JToolTip.h
deleted file mode 100644
index d622528f066..00000000000
--- a/libjava/javax/swing/JToolTip.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolTip__
-#define __javax_swing_JToolTip__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JToolTip;
-      namespace plaf
-      {
-          class ToolTipUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JToolTip : public ::javax::swing::JComponent
-{
-
-public:
-  JToolTip();
-  virtual ::java::lang::String * getTipText();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::JComponent * getComponent();
-  virtual ::javax::swing::plaf::ToolTipUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void setComponent(::javax::swing::JComponent *);
-  virtual void setTipText(::java::lang::String *);
-  virtual void updateUI();
-public: // actually package-private
-  virtual jboolean onTop();
-private:
-  static const jlong serialVersionUID = -1138929898906751643LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) text;
-  ::javax::swing::JComponent * component;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolTip__
diff --git a/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h b/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h
deleted file mode 100644
index 40d1f977081..00000000000
--- a/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
-#define __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleAction;
-        class AccessibleComponent;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-        class AccessibleText;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JTree;
-        class JTree$AccessibleJTree;
-        class JTree$AccessibleJTree$AccessibleJTreeNode;
-      namespace tree
-      {
-          class TreeModel;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$AccessibleJTree$AccessibleJTreeNode : public ::javax::accessibility::AccessibleContext
-{
-
-public:
-  JTree$AccessibleJTree$AccessibleJTreeNode(::javax::swing::JTree$AccessibleJTree *, ::javax::swing::JTree *, ::javax::swing::tree::TreePath *, ::javax::accessibility::Accessible *);
-  virtual void addAccessibleSelection(jint);
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void clearAccessibleSelection();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual jint getAccessibleIndexInParent();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::Accessible * getAccessibleParent();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Cursor * getCursor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::awt::Point * getLocation();
-public: // actually protected
-  virtual ::java::awt::Point * getLocationInJTree();
-public:
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getSize();
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual jboolean isEnabled();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isShowing();
-  virtual jboolean isVisible();
-  virtual void removeAccessibleSelection(jint);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void requestFocus();
-  virtual void selectAllAccessibleSelection();
-  virtual void setAccessibleDescription(::java::lang::String *);
-  virtual void setAccessibleName(::java::lang::String *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setVisible(jboolean);
-private:
-  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) tree;
-  ::javax::swing::tree::TreePath * tp;
-  ::javax::accessibility::Accessible * acc;
-  ::javax::accessibility::AccessibleStateSet * states;
-  ::java::util::Vector * selectionList;
-  ::java::util::Vector * actionList;
-  ::javax::swing::tree::TreeModel * mod;
-  ::java::awt::Cursor * cursor;
-public: // actually package-private
-  ::javax::swing::JTree$AccessibleJTree * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
diff --git a/libjava/javax/swing/JTree$AccessibleJTree.h b/libjava/javax/swing/JTree$AccessibleJTree.h
deleted file mode 100644
index e4b60e1e167..00000000000
--- a/libjava/javax/swing/JTree$AccessibleJTree.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$AccessibleJTree__
-#define __javax_swing_JTree$AccessibleJTree__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-    }
-    namespace swing
-    {
-        class JTree;
-        class JTree$AccessibleJTree;
-      namespace event
-      {
-          class TreeExpansionEvent;
-          class TreeModelEvent;
-          class TreeSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$AccessibleJTree : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JTree$AccessibleJTree(::javax::swing::JTree *);
-  virtual void addAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void fireVisibleDataPropertyChange();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleChildrenCount();
-  virtual jint getAccessibleIndexInParent();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void selectAllAccessibleSelection();
-  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *);
-  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *);
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
-public: // actually package-private
-  static ::javax::swing::JTree * access$0(::javax::swing::JTree$AccessibleJTree *);
-  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$AccessibleJTree__
diff --git a/libjava/javax/swing/JTree$DynamicUtilTreeNode.h b/libjava/javax/swing/JTree$DynamicUtilTreeNode.h
deleted file mode 100644
index 0d658dd371e..00000000000
--- a/libjava/javax/swing/JTree$DynamicUtilTreeNode.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$DynamicUtilTreeNode__
-#define __javax_swing_JTree$DynamicUtilTreeNode__
-
-#pragma interface
-
-#include <javax/swing/tree/DefaultMutableTreeNode.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree$DynamicUtilTreeNode;
-      namespace tree
-      {
-          class DefaultMutableTreeNode;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$DynamicUtilTreeNode : public ::javax::swing::tree::DefaultMutableTreeNode
-{
-
-public:
-  JTree$DynamicUtilTreeNode(::java::lang::Object *, ::java::lang::Object *);
-  virtual jint getChildCount();
-public: // actually protected
-  virtual void loadChildren();
-public:
-  virtual ::java::util::Enumeration * children();
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
-  virtual jboolean isLeaf();
-  static void createChildren(::javax::swing::tree::DefaultMutableTreeNode *, ::java::lang::Object *);
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::tree::DefaultMutableTreeNode)))) childValue;
-  jboolean loadedChildren;
-  jboolean hasChildren;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$DynamicUtilTreeNode__
diff --git a/libjava/javax/swing/JTree$EmptySelectionModel.h b/libjava/javax/swing/JTree$EmptySelectionModel.h
deleted file mode 100644
index bafe35f2d7e..00000000000
--- a/libjava/javax/swing/JTree$EmptySelectionModel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$EmptySelectionModel__
-#define __javax_swing_JTree$EmptySelectionModel__
-
-#pragma interface
-
-#include <javax/swing/tree/DefaultTreeSelectionModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree$EmptySelectionModel;
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$EmptySelectionModel : public ::javax::swing::tree::DefaultTreeSelectionModel
-{
-
-public: // actually protected
-  JTree$EmptySelectionModel();
-public:
-  static ::javax::swing::JTree$EmptySelectionModel * sharedInstance();
-  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-private:
-  static const jlong serialVersionUID = -5815023306225701477LL;
-public: // actually protected
-  static ::javax::swing::JTree$EmptySelectionModel * sharedInstance__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$EmptySelectionModel__
diff --git a/libjava/javax/swing/JTree$TreeModelHandler.h b/libjava/javax/swing/JTree$TreeModelHandler.h
deleted file mode 100644
index 3fc8f654993..00000000000
--- a/libjava/javax/swing/JTree$TreeModelHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$TreeModelHandler__
-#define __javax_swing_JTree$TreeModelHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-        class JTree$TreeModelHandler;
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$TreeModelHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  JTree$TreeModelHandler(::javax::swing::JTree *);
-public:
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-public: // actually package-private
-  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$TreeModelHandler__
diff --git a/libjava/javax/swing/JTree$TreeSelectionRedirector.h b/libjava/javax/swing/JTree$TreeSelectionRedirector.h
deleted file mode 100644
index a7a1a6e65bd..00000000000
--- a/libjava/javax/swing/JTree$TreeSelectionRedirector.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$TreeSelectionRedirector__
-#define __javax_swing_JTree$TreeSelectionRedirector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-        class JTree$TreeSelectionRedirector;
-      namespace event
-      {
-          class TreeSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$TreeSelectionRedirector : public ::java::lang::Object
-{
-
-public: // actually protected
-  JTree$TreeSelectionRedirector(::javax::swing::JTree *);
-public:
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
-private:
-  static const jlong serialVersionUID = -3505069663646241664LL;
-public: // actually package-private
-  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$TreeSelectionRedirector__
diff --git a/libjava/javax/swing/JTree.h b/libjava/javax/swing/JTree.h
deleted file mode 100644
index c9e66df2cb0..00000000000
--- a/libjava/javax/swing/JTree.h
+++ /dev/null
@@ -1,270 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree__
-#define __javax_swing_JTree__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JTree;
-        class JTree$TreeSelectionRedirector;
-      namespace event
-      {
-          class TreeExpansionListener;
-          class TreeModelListener;
-          class TreeSelectionEvent;
-          class TreeSelectionListener;
-          class TreeWillExpandListener;
-      }
-      namespace plaf
-      {
-          class TreeUI;
-      }
-      namespace text
-      {
-          class Position$Bias;
-      }
-      namespace tree
-      {
-          class TreeCellEditor;
-          class TreeCellRenderer;
-          class TreeModel;
-          class TreeNode;
-          class TreePath;
-          class TreeSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree : public ::javax::swing::JComponent
-{
-
-public:
-  JTree();
-  JTree(::java::util::Hashtable *);
-  JTree(JArray< ::java::lang::Object * > *);
-  JTree(::javax::swing::tree::TreeModel *);
-  JTree(::javax::swing::tree::TreeNode *);
-  JTree(::javax::swing::tree::TreeNode *, jboolean);
-  JTree(::java::util::Vector *);
-  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
-public: // actually protected
-  virtual JArray< ::javax::swing::tree::TreePath * > * getPathBetweenRows(jint, jint);
-  static ::javax::swing::tree::TreeModel * createTreeModel(::java::lang::Object *);
-public:
-  virtual ::javax::swing::plaf::TreeUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TreeUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual void addTreeExpansionListener(::javax::swing::event::TreeExpansionListener *);
-  virtual void removeTreeExpansionListener(::javax::swing::event::TreeExpansionListener *);
-  virtual JArray< ::javax::swing::event::TreeExpansionListener * > * getTreeExpansionListeners();
-  virtual void fireTreeCollapsed(::javax::swing::tree::TreePath *);
-  virtual void fireTreeExpanded(::javax::swing::tree::TreePath *);
-  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
-  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
-  virtual JArray< ::javax::swing::event::TreeSelectionListener * > * getTreeSelectionListeners();
-public: // actually protected
-  virtual void fireValueChanged(::javax::swing::event::TreeSelectionEvent *);
-public:
-  virtual void addTreeWillExpandListener(::javax::swing::event::TreeWillExpandListener *);
-  virtual void removeTreeWillExpandListener(::javax::swing::event::TreeWillExpandListener *);
-  virtual JArray< ::javax::swing::event::TreeWillExpandListener * > * getTreeWillExpandListeners();
-  virtual void fireTreeWillCollapse(::javax::swing::tree::TreePath *);
-  virtual void fireTreeWillExpand(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreeModel * getModel();
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual jboolean isEditable();
-  virtual void setEditable(jboolean);
-  virtual jboolean isRootVisible();
-  virtual void setRootVisible(jboolean);
-  virtual jboolean getShowsRootHandles();
-  virtual void setShowsRootHandles(jboolean);
-  virtual ::javax::swing::tree::TreeCellEditor * getCellEditor();
-  virtual void setCellEditor(::javax::swing::tree::TreeCellEditor *);
-  virtual ::javax::swing::tree::TreeCellRenderer * getCellRenderer();
-  virtual void setCellRenderer(::javax::swing::tree::TreeCellRenderer *);
-  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
-  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
-  virtual jint getVisibleRowCount();
-  virtual void setVisibleRowCount(jint);
-  virtual jboolean isLargeModel();
-  virtual void setLargeModel(jboolean);
-  virtual jint getRowHeight();
-  virtual void setRowHeight(jint);
-  virtual jboolean isFixedRowHeight();
-  virtual jboolean getInvokesStopCellEditing();
-  virtual void setInvokesStopCellEditing(jboolean);
-  virtual jint getToggleClickCount();
-  virtual void setToggleClickCount(jint);
-  virtual void scrollPathToVisible(::javax::swing::tree::TreePath *);
-  virtual void scrollRowToVisible(jint);
-  virtual jboolean getScrollsOnExpand();
-  virtual void setScrollsOnExpand(jboolean);
-  virtual void setSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-private:
-  void clearSelectionPathStates();
-public:
-  virtual void setSelectionRow(jint);
-  virtual void setSelectionRows(JArray< jint > *);
-  virtual void setSelectionInterval(jint, jint);
-  virtual void addSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void addSelectionRow(jint);
-  virtual void addSelectionRows(JArray< jint > *);
-  virtual void addSelectionInterval(jint, jint);
-  virtual void removeSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void removeSelectionRow(jint);
-  virtual void removeSelectionRows(JArray< jint > *);
-  virtual void removeSelectionInterval(jint, jint);
-  virtual void clearSelection();
-  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath();
-  virtual void setLeadSelectionPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getAnchorSelectionPath();
-  virtual void setAnchorSelectionPath(::javax::swing::tree::TreePath *);
-  virtual jint getLeadSelectionRow();
-  virtual jint getMaxSelectionRow();
-  virtual jint getMinSelectionRow();
-  virtual jint getSelectionCount();
-  virtual ::javax::swing::tree::TreePath * getSelectionPath();
-  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths();
-  virtual JArray< jint > * getSelectionRows();
-  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *);
-  virtual jboolean isRowSelected(jint);
-  virtual jboolean isSelectionEmpty();
-  virtual jboolean getDragEnabled();
-  virtual void setDragEnabled(jboolean);
-  virtual jint getRowCount();
-  virtual void collapsePath(::javax::swing::tree::TreePath *);
-  virtual void collapseRow(jint);
-  virtual void expandPath(::javax::swing::tree::TreePath *);
-  virtual void expandRow(jint);
-  virtual jboolean isCollapsed(::javax::swing::tree::TreePath *);
-  virtual jboolean isCollapsed(jint);
-  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
-  virtual jboolean isExpanded(jint);
-  virtual jboolean getExpandsSelectedPaths();
-  virtual void setExpandsSelectedPaths(jboolean);
-  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::tree::TreePath *);
-  virtual ::java::awt::Rectangle * getRowBounds(jint);
-  virtual jboolean isEditing();
-  virtual jboolean stopEditing();
-  virtual void cancelEditing();
-  virtual void startEditingAtPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getEditingPath();
-  virtual ::javax::swing::tree::TreePath * getPathForLocation(jint, jint);
-  virtual jint getRowForLocation(jint, jint);
-  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(jint, jint);
-  virtual jint getClosestRowForLocation(jint, jint);
-  virtual ::java::lang::Object * getLastSelectedPathComponent();
-private:
-  void doExpandParents(::javax::swing::tree::TreePath *, jboolean);
-public: // actually protected
-  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
-  virtual void clearToggledPaths();
-  virtual ::java::util::Enumeration * getDescendantToggledPaths(::javax::swing::tree::TreePath *);
-public:
-  virtual jboolean hasBeenExpanded(::javax::swing::tree::TreePath *);
-  virtual jboolean isVisible(::javax::swing::tree::TreePath *);
-  virtual void makeVisible(::javax::swing::tree::TreePath *);
-  virtual jboolean isPathEditable(::javax::swing::tree::TreePath *);
-public: // actually protected
-  virtual ::javax::swing::event::TreeModelListener * createTreeModelListener();
-  static ::javax::swing::tree::TreeModel * getDefaultTreeModel();
-public:
-  virtual ::java::lang::String * convertValueToText(::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::java::util::Enumeration * getExpandedDescendants(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getNextMatch(::java::lang::String *, jint, ::javax::swing::text::Position$Bias *);
-public: // actually protected
-  virtual jboolean removeDescendantSelectedPaths(::javax::swing::tree::TreePath *, jboolean);
-  virtual void removeDescendantToggledPaths(::java::util::Enumeration *);
-public:
-  virtual void treeDidChange();
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 7559816092864483649LL;
-public:
-  static ::java::lang::String * CELL_EDITOR_PROPERTY;
-  static ::java::lang::String * CELL_RENDERER_PROPERTY;
-  static ::java::lang::String * EDITABLE_PROPERTY;
-  static ::java::lang::String * INVOKES_STOP_CELL_EDITING_PROPERTY;
-  static ::java::lang::String * LARGE_MODEL_PROPERTY;
-  static ::java::lang::String * ROOT_VISIBLE_PROPERTY;
-  static ::java::lang::String * ROW_HEIGHT_PROPERTY;
-  static ::java::lang::String * SCROLLS_ON_EXPAND_PROPERTY;
-  static ::java::lang::String * SELECTION_MODEL_PROPERTY;
-  static ::java::lang::String * SHOWS_ROOT_HANDLES_PROPERTY;
-  static ::java::lang::String * TOGGLE_CLICK_COUNT_PROPERTY;
-  static ::java::lang::String * TREE_MODEL_PROPERTY;
-  static ::java::lang::String * VISIBLE_ROW_COUNT_PROPERTY;
-  static ::java::lang::String * ANCHOR_SELECTION_PATH_PROPERTY;
-  static ::java::lang::String * LEAD_SELECTION_PATH_PROPERTY;
-  static ::java::lang::String * EXPANDS_SELECTED_PATHS_PROPERTY;
-private:
-  static ::java::lang::Object * EXPANDED;
-  static ::java::lang::Object * COLLAPSED;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dragEnabled;
-  jboolean expandsSelectedPaths;
-  ::javax::swing::tree::TreePath * anchorSelectionPath;
-public: // actually package-private
-  ::java::util::Hashtable * nodeStates;
-public: // actually protected
-  ::javax::swing::tree::TreeCellEditor * cellEditor;
-  ::javax::swing::tree::TreeCellRenderer * cellRenderer;
-  jboolean editable;
-  jboolean invokesStopCellEditing;
-  jboolean largeModel;
-  jboolean rootVisible;
-  jint rowHeight;
-  jboolean scrollsOnExpand;
-  ::javax::swing::tree::TreeSelectionModel * selectionModel;
-  jboolean showsRootHandles;
-  jint toggleClickCount;
-  ::javax::swing::tree::TreeModel * treeModel;
-  jint visibleRowCount;
-  ::javax::swing::event::TreeModelListener * treeModelListener;
-  ::javax::swing::JTree$TreeSelectionRedirector * selectionRedirector;
-private:
-  jboolean clientRowHeightSet;
-  jboolean clientScrollsOnExpandSet;
-  jboolean clientShowsRootHandlesSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree__
diff --git a/libjava/javax/swing/JViewport$AccessibleJViewport.h b/libjava/javax/swing/JViewport$AccessibleJViewport.h
deleted file mode 100644
index bccdb7f29b1..00000000000
--- a/libjava/javax/swing/JViewport$AccessibleJViewport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JViewport$AccessibleJViewport__
-#define __javax_swing_JViewport$AccessibleJViewport__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JViewport;
-        class JViewport$AccessibleJViewport;
-    }
-  }
-}
-
-class javax::swing::JViewport$AccessibleJViewport : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JViewport$AccessibleJViewport(::javax::swing::JViewport *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JViewport$AccessibleJViewport__
diff --git a/libjava/javax/swing/JViewport$ViewListener.h b/libjava/javax/swing/JViewport$ViewListener.h
deleted file mode 100644
index a7de943b699..00000000000
--- a/libjava/javax/swing/JViewport$ViewListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JViewport$ViewListener__
-#define __javax_swing_JViewport$ViewListener__
-
-#pragma interface
-
-#include <java/awt/event/ComponentAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JViewport;
-        class JViewport$ViewListener;
-    }
-  }
-}
-
-class javax::swing::JViewport$ViewListener : public ::java::awt::event::ComponentAdapter
-{
-
-public: // actually protected
-  JViewport$ViewListener(::javax::swing::JViewport *);
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-private:
-  static const jlong serialVersionUID = -2812489404285958070LL;
-public: // actually package-private
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JViewport$ViewListener__
diff --git a/libjava/javax/swing/JViewport.h b/libjava/javax/swing/JViewport.h
deleted file mode 100644
index 0ac6b8fbddc..00000000000
--- a/libjava/javax/swing/JViewport.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JViewport__
-#define __javax_swing_JViewport__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Image;
-        class Insets;
-        class LayoutManager;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JViewport;
-        class JViewport$ViewListener;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ViewportUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JViewport : public ::javax::swing::JComponent
-{
-
-public:
-  JViewport();
-  virtual ::java::awt::Dimension * getExtentSize();
-  virtual ::java::awt::Dimension * toViewCoordinates(::java::awt::Dimension *);
-  virtual ::java::awt::Point * toViewCoordinates(::java::awt::Point *);
-  virtual void setExtentSize(::java::awt::Dimension *);
-  virtual ::java::awt::Dimension * getViewSize();
-  virtual void setViewSize(::java::awt::Dimension *);
-  virtual ::java::awt::Point * getViewPosition();
-  virtual void setViewPosition(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getViewRect();
-  virtual jboolean isBackingStoreEnabled();
-  virtual void setBackingStoreEnabled(jboolean);
-  virtual void setScrollMode(jint);
-  virtual jint getScrollMode();
-  virtual ::java::awt::Component * getView();
-  virtual void setView(::java::awt::Component *);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * getInsets(::java::awt::Insets *);
-  virtual jboolean isOptimizedDrawingEnabled();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual ::java::lang::String * getUIClassID();
-  virtual void updateUI();
-  virtual ::javax::swing::plaf::ViewportUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ViewportUI *);
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual void scrollRectToVisible(::java::awt::Rectangle *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-  virtual void fireStateChanged();
-  virtual ::javax::swing::JViewport$ViewListener * createViewListener();
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual jboolean computeBlit(jint, jint, ::java::awt::Point *, ::java::awt::Point *, ::java::awt::Dimension *, ::java::awt::Rectangle *);
-public: // actually package-private
-  virtual void paintSimple(::java::awt::Graphics *);
-  virtual void paintBackingStore(::java::awt::Graphics *);
-  virtual void paintBlit(::java::awt::Graphics *);
-  virtual void paintImmediately2(jint, jint, jint, jint);
-  virtual jboolean isPaintRoot();
-public:
-  static const jint SIMPLE_SCROLL_MODE = 0;
-  static const jint BLIT_SCROLL_MODE = 1;
-  static const jint BACKINGSTORE_SCROLL_MODE = 2;
-private:
-  static const jlong serialVersionUID = -6925142919680527970LL;
-  static jint defaultScrollMode;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) scrollUnderway;
-  jboolean isViewSizeSet;
-  jboolean backingStore;
-  ::java::awt::Image * backingStoreImage;
-  ::java::awt::Point * lastPaintPosition;
-public: // actually package-private
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  jint scrollMode;
-  ::javax::swing::JViewport$ViewListener * viewListener;
-  ::java::awt::Point * cachedBlitFrom;
-  ::java::awt::Point * cachedBlitTo;
-  ::java::awt::Dimension * cachedBlitSize;
-  ::java::awt::Rectangle * cachedBlitPaint;
-  jboolean damaged;
-  jboolean sizeChanged;
-private:
-  jboolean isPaintRoot__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JViewport__
diff --git a/libjava/javax/swing/JWindow$AccessibleJWindow.h b/libjava/javax/swing/JWindow$AccessibleJWindow.h
deleted file mode 100644
index f7aa58a2b9b..00000000000
--- a/libjava/javax/swing/JWindow$AccessibleJWindow.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JWindow$AccessibleJWindow__
-#define __javax_swing_JWindow$AccessibleJWindow__
-
-#pragma interface
-
-#include <java/awt/Window$AccessibleAWTWindow.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JWindow;
-        class JWindow$AccessibleJWindow;
-    }
-  }
-}
-
-class javax::swing::JWindow$AccessibleJWindow : public ::java::awt::Window$AccessibleAWTWindow
-{
-
-public: // actually protected
-  JWindow$AccessibleJWindow(::javax::swing::JWindow *);
-public: // actually package-private
-  ::javax::swing::JWindow * __attribute__((aligned(__alignof__( ::java::awt::Window$AccessibleAWTWindow)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JWindow$AccessibleJWindow__
diff --git a/libjava/javax/swing/JWindow.h b/libjava/javax/swing/JWindow.h
deleted file mode 100644
index 89a7ebab7d0..00000000000
--- a/libjava/javax/swing/JWindow.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JWindow__
-#define __javax_swing_JWindow__
-
-#pragma interface
-
-#include <java/awt/Window.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Frame;
-        class Graphics;
-        class GraphicsConfiguration;
-        class LayoutManager;
-        class Window;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JLayeredPane;
-        class JRootPane;
-        class JWindow;
-    }
-  }
-}
-
-class javax::swing::JWindow : public ::java::awt::Window
-{
-
-public:
-  JWindow();
-  JWindow(::java::awt::GraphicsConfiguration *);
-  JWindow(::java::awt::Frame *);
-  JWindow(::java::awt::Window *);
-  JWindow(::java::awt::Window *, ::java::awt::GraphicsConfiguration *);
-public: // actually protected
-  virtual void windowInit();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JRootPane * getRootPane();
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void remove(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void update(::java::awt::Graphics *);
-public: // actually protected
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 5420698392125238833LL;
-public: // actually protected
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::java::awt::Window)))) rootPane;
-  jboolean rootPaneCheckingEnabled;
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JWindow__
diff --git a/libjava/javax/swing/KeyStroke.h b/libjava/javax/swing/KeyStroke.h
deleted file mode 100644
index 640225608dc..00000000000
--- a/libjava/javax/swing/KeyStroke.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_KeyStroke__
-#define __javax_swing_KeyStroke__
-
-#pragma interface
-
-#include <java/awt/AWTKeyStroke.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class KeyStroke;
-    }
-  }
-}
-
-class javax::swing::KeyStroke : public ::java::awt::AWTKeyStroke
-{
-
-  KeyStroke();
-  KeyStroke(jchar, jint, jint, jboolean);
-public:
-  static ::javax::swing::KeyStroke * getKeyStroke(jchar);
-  static ::javax::swing::KeyStroke * getKeyStroke(jchar, jboolean);
-  static ::javax::swing::KeyStroke * getKeyStroke(::java::lang::Character *, jint);
-  static ::javax::swing::KeyStroke * getKeyStroke(jint, jint, jboolean);
-  static ::javax::swing::KeyStroke * getKeyStroke(jint, jint);
-  static ::javax::swing::KeyStroke * getKeyStroke(::java::lang::String *);
-  static ::javax::swing::KeyStroke * getKeyStrokeForEvent(::java::awt::event::KeyEvent *);
-private:
-  static const jlong serialVersionUID = -9060180771037902530LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_KeyStroke__
diff --git a/libjava/javax/swing/KeyboardManager.h b/libjava/javax/swing/KeyboardManager.h
deleted file mode 100644
index 28679e6c28c..00000000000
--- a/libjava/javax/swing/KeyboardManager.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_KeyboardManager__
-#define __javax_swing_KeyboardManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComponentInputMap;
-        class JComponent;
-        class JMenuBar;
-        class KeyStroke;
-        class KeyboardManager;
-    }
-  }
-}
-
-class javax::swing::KeyboardManager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  KeyboardManager();
-public:
-  static ::javax::swing::KeyboardManager * getManager();
-public: // actually package-private
-  static ::java::awt::Container * findTopLevel(::java::awt::Component *);
-  virtual ::java::util::Hashtable * getHashtableForTopLevel(::java::awt::Container *);
-public:
-  virtual void registerBinding(::javax::swing::JComponent *, ::javax::swing::KeyStroke *);
-  virtual void clearBindingsForComp(::javax::swing::JComponent *);
-  virtual void registerEntireMap(::javax::swing::ComponentInputMap *);
-  virtual jboolean processKeyStroke(::java::awt::Component *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *);
-public: // actually package-private
-  virtual ::java::util::Vector * getVectorForTopLevel(::java::awt::Container *);
-public:
-  virtual void registerJMenuBar(::javax::swing::JMenuBar *);
-  virtual void unregisterJMenuBar(::javax::swing::JMenuBar *);
-public: // actually package-private
-  static ::javax::swing::KeyboardManager * manager;
-  ::java::util::WeakHashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) topLevelLookup;
-  ::java::util::Hashtable * menuBarLookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_KeyboardManager__
diff --git a/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h b/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h
deleted file mode 100644
index 5687b1fb258..00000000000
--- a/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
-#define __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class LayoutFocusTraversalPolicy$LayoutComparator;
-    }
-  }
-}
-
-class javax::swing::LayoutFocusTraversalPolicy$LayoutComparator : public ::java::lang::Object
-{
-
-public:
-  LayoutFocusTraversalPolicy$LayoutComparator();
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
diff --git a/libjava/javax/swing/LayoutFocusTraversalPolicy.h b/libjava/javax/swing/LayoutFocusTraversalPolicy.h
deleted file mode 100644
index 29883c2217c..00000000000
--- a/libjava/javax/swing/LayoutFocusTraversalPolicy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_LayoutFocusTraversalPolicy__
-#define __javax_swing_LayoutFocusTraversalPolicy__
-
-#pragma interface
-
-#include <javax/swing/SortingFocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class LayoutFocusTraversalPolicy;
-    }
-  }
-}
-
-class javax::swing::LayoutFocusTraversalPolicy : public ::javax::swing::SortingFocusTraversalPolicy
-{
-
-public:
-  LayoutFocusTraversalPolicy();
-private:
-  static const jlong serialVersionUID = 4312146927238881442LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_LayoutFocusTraversalPolicy__
diff --git a/libjava/javax/swing/ListCellRenderer.h b/libjava/javax/swing/ListCellRenderer.h
deleted file mode 100644
index 324a2184857..00000000000
--- a/libjava/javax/swing/ListCellRenderer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ListCellRenderer__
-#define __javax_swing_ListCellRenderer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class ListCellRenderer;
-    }
-  }
-}
-
-class javax::swing::ListCellRenderer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ListCellRenderer__
diff --git a/libjava/javax/swing/ListModel.h b/libjava/javax/swing/ListModel.h
deleted file mode 100644
index 73f268f7e67..00000000000
--- a/libjava/javax/swing/ListModel.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ListModel__
-#define __javax_swing_ListModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ListModel;
-      namespace event
-      {
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::ListModel : public ::java::lang::Object
-{
-
-public:
-  virtual jint getSize() = 0;
-  virtual ::java::lang::Object * getElementAt(jint) = 0;
-  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ListModel__
diff --git a/libjava/javax/swing/ListSelectionModel.h b/libjava/javax/swing/ListSelectionModel.h
deleted file mode 100644
index d7c7363cf12..00000000000
--- a/libjava/javax/swing/ListSelectionModel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ListSelectionModel__
-#define __javax_swing_ListSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ListSelectionModel;
-      namespace event
-      {
-          class ListSelectionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::ListSelectionModel : public ::java::lang::Object
-{
-
-public:
-  virtual void setSelectionMode(jint) = 0;
-  virtual jint getSelectionMode() = 0;
-  virtual void clearSelection() = 0;
-  virtual jint getMinSelectionIndex() = 0;
-  virtual jint getMaxSelectionIndex() = 0;
-  virtual jboolean isSelectedIndex(jint) = 0;
-  virtual jboolean isSelectionEmpty() = 0;
-  virtual void setSelectionInterval(jint, jint) = 0;
-  virtual void addSelectionInterval(jint, jint) = 0;
-  virtual void removeSelectionInterval(jint, jint) = 0;
-  virtual void insertIndexInterval(jint, jint, jboolean) = 0;
-  virtual void removeIndexInterval(jint, jint) = 0;
-  virtual jint getAnchorSelectionIndex() = 0;
-  virtual void setAnchorSelectionIndex(jint) = 0;
-  virtual jint getLeadSelectionIndex() = 0;
-  virtual void setLeadSelectionIndex(jint) = 0;
-  virtual void setValueIsAdjusting(jboolean) = 0;
-  virtual jboolean getValueIsAdjusting() = 0;
-  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *) = 0;
-  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *) = 0;
-  static const jint SINGLE_SELECTION = 0;
-  static const jint SINGLE_INTERVAL_SELECTION = 1;
-  static const jint MULTIPLE_INTERVAL_SELECTION = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ListSelectionModel__
diff --git a/libjava/javax/swing/LookAndFeel$1.h b/libjava/javax/swing/LookAndFeel$1.h
deleted file mode 100644
index 8764efbe48c..00000000000
--- a/libjava/javax/swing/LookAndFeel$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_LookAndFeel$1__
-#define __javax_swing_LookAndFeel$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class LookAndFeel$1;
-        class UIDefaults;
-    }
-  }
-}
-
-class javax::swing::LookAndFeel$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LookAndFeel$1(::java::net::URL *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_LookAndFeel$1__
diff --git a/libjava/javax/swing/LookAndFeel.h b/libjava/javax/swing/LookAndFeel.h
deleted file mode 100644
index 1a1fd217760..00000000000
--- a/libjava/javax/swing/LookAndFeel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_LookAndFeel__
-#define __javax_swing_LookAndFeel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComponentInputMap;
-        class InputMap;
-        class JComponent;
-        class LookAndFeel;
-        class UIDefaults;
-      namespace text
-      {
-          class JTextComponent$KeyBinding;
-      }
-    }
-  }
-}
-
-class javax::swing::LookAndFeel : public ::java::lang::Object
-{
-
-public:
-  LookAndFeel();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-  virtual ::java::lang::String * getDescription() = 0;
-  static ::java::lang::Object * getDesktopPropertyValue(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::String * getID() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual jboolean getSupportsWindowDecorations();
-  virtual void initialize();
-  static void installBorder(::javax::swing::JComponent *, ::java::lang::String *);
-  static void installColors(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::String *);
-  static void installColorsAndFont(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual jboolean isNativeLookAndFeel() = 0;
-  virtual jboolean isSupportedLookAndFeel() = 0;
-  static void loadKeyBindings(::javax::swing::InputMap *, JArray< ::java::lang::Object * > *);
-  static ::javax::swing::ComponentInputMap * makeComponentInputMap(::javax::swing::JComponent *, JArray< ::java::lang::Object * > *);
-  static ::java::lang::Object * makeIcon(::java::lang::Class *, ::java::lang::String *);
-  static ::javax::swing::InputMap * makeInputMap(JArray< ::java::lang::Object * > *);
-  static JArray< ::javax::swing::text::JTextComponent$KeyBinding * > * makeKeyBindings(JArray< ::java::lang::Object * > *);
-  virtual void provideErrorFeedback(::java::awt::Component *);
-  virtual ::java::lang::String * toString();
-  virtual void uninitialize();
-  static void uninstallBorder(::javax::swing::JComponent *);
-  static void installProperty(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_LookAndFeel__
diff --git a/libjava/javax/swing/MenuElement.h b/libjava/javax/swing/MenuElement.h
deleted file mode 100644
index d48ef967887..00000000000
--- a/libjava/javax/swing/MenuElement.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_MenuElement__
-#define __javax_swing_MenuElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class MenuElement;
-        class MenuSelectionManager;
-    }
-  }
-}
-
-class javax::swing::MenuElement : public ::java::lang::Object
-{
-
-public:
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *) = 0;
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *) = 0;
-  virtual void menuSelectionChanged(jboolean) = 0;
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements() = 0;
-  virtual ::java::awt::Component * getComponent() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_MenuElement__
diff --git a/libjava/javax/swing/MenuSelectionManager.h b/libjava/javax/swing/MenuSelectionManager.h
deleted file mode 100644
index 8e3cfa9e9a7..00000000000
--- a/libjava/javax/swing/MenuSelectionManager.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_MenuSelectionManager__
-#define __javax_swing_MenuSelectionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::MenuSelectionManager : public ::java::lang::Object
-{
-
-public:
-  MenuSelectionManager();
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual void clearSelectedPath();
-  virtual ::java::awt::Component * componentForPoint(::java::awt::Component *, ::java::awt::Point *);
-  static ::javax::swing::MenuSelectionManager * defaultManager();
-  virtual JArray< ::javax::swing::MenuElement * > * getSelectedPath();
-  virtual jboolean isComponentPartOfCurrentMenu(::java::awt::Component *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void setSelectedPath(JArray< ::javax::swing::MenuElement * > *);
-private:
-  JArray< ::javax::swing::MenuElement * > * getPath(::java::awt::Component *);
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  static ::javax::swing::MenuSelectionManager * manager;
-  ::java::util::Vector * selectedPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_MenuSelectionManager__
diff --git a/libjava/javax/swing/MutableComboBoxModel.h b/libjava/javax/swing/MutableComboBoxModel.h
deleted file mode 100644
index cfc67715280..00000000000
--- a/libjava/javax/swing/MutableComboBoxModel.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_MutableComboBoxModel__
-#define __javax_swing_MutableComboBoxModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class MutableComboBoxModel;
-      namespace event
-      {
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::MutableComboBoxModel : public ::java::lang::Object
-{
-
-public:
-  virtual void addElement(::java::lang::Object *) = 0;
-  virtual void removeElementAt(jint) = 0;
-  virtual void insertElementAt(::java::lang::Object *, jint) = 0;
-  virtual void removeElement(::java::lang::Object *) = 0;
-  virtual void setSelectedItem(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getSelectedItem() = 0;
-  virtual jint getSize() = 0;
-  virtual ::java::lang::Object * getElementAt(jint) = 0;
-  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_MutableComboBoxModel__
diff --git a/libjava/javax/swing/OverlayLayout.h b/libjava/javax/swing/OverlayLayout.h
deleted file mode 100644
index 065b35f3b64..00000000000
--- a/libjava/javax/swing/OverlayLayout.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_OverlayLayout__
-#define __javax_swing_OverlayLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class OverlayLayout;
-        class SizeRequirements;
-    }
-  }
-}
-
-class javax::swing::OverlayLayout : public ::java::lang::Object
-{
-
-public:
-  OverlayLayout(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-private:
-  void checkRequirements();
-  void checkTotalRequirements();
-  void checkLayout();
-  static const jlong serialVersionUID = 18082829169631543LL;
-  ::java::awt::Container * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  JArray< ::javax::swing::SizeRequirements * > * xChildren;
-  JArray< ::javax::swing::SizeRequirements * > * yChildren;
-  ::javax::swing::SizeRequirements * xTotal;
-  ::javax::swing::SizeRequirements * yTotal;
-  JArray< jint > * offsetsX;
-  JArray< jint > * offsetsY;
-  JArray< jint > * spansX;
-  JArray< jint > * spansY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_OverlayLayout__
diff --git a/libjava/javax/swing/Popup$JWindowPopup.h b/libjava/javax/swing/Popup$JWindowPopup.h
deleted file mode 100644
index fd6d60d6721..00000000000
--- a/libjava/javax/swing/Popup$JWindowPopup.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Popup$JWindowPopup__
-#define __javax_swing_Popup$JWindowPopup__
-
-#pragma interface
-
-#include <javax/swing/Popup.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JWindow;
-        class Popup$JWindowPopup;
-    }
-  }
-}
-
-class javax::swing::Popup$JWindowPopup : public ::javax::swing::Popup
-{
-
-public:
-  Popup$JWindowPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
-  virtual void show();
-  virtual void hide();
-public: // actually package-private
-  ::javax::swing::JWindow * __attribute__((aligned(__alignof__( ::javax::swing::Popup)))) window;
-private:
-  ::java::awt::Component * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Popup$JWindowPopup__
diff --git a/libjava/javax/swing/Popup$LightweightPopup.h b/libjava/javax/swing/Popup$LightweightPopup.h
deleted file mode 100644
index d9b0123af90..00000000000
--- a/libjava/javax/swing/Popup$LightweightPopup.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Popup$LightweightPopup__
-#define __javax_swing_Popup$LightweightPopup__
-
-#pragma interface
-
-#include <javax/swing/Popup.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JLayeredPane;
-        class JPanel;
-        class Popup$LightweightPopup;
-    }
-  }
-}
-
-class javax::swing::Popup$LightweightPopup : public ::javax::swing::Popup
-{
-
-public:
-  Popup$LightweightPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
-  virtual void show();
-  virtual void hide();
-public: // actually package-private
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Popup)))) owner;
-  ::java::awt::Component * contents;
-  jint x;
-  jint y;
-private:
-  ::javax::swing::JPanel * panel;
-  ::javax::swing::JLayeredPane * layeredPane;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Popup$LightweightPopup__
diff --git a/libjava/javax/swing/Popup.h b/libjava/javax/swing/Popup.h
deleted file mode 100644
index 8c7f4b1fe69..00000000000
--- a/libjava/javax/swing/Popup.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Popup__
-#define __javax_swing_Popup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Popup;
-    }
-  }
-}
-
-class javax::swing::Popup : public ::java::lang::Object
-{
-
-public: // actually protected
-  Popup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
-  Popup();
-public:
-  virtual void show();
-  virtual void hide();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Popup__
diff --git a/libjava/javax/swing/PopupFactory.h b/libjava/javax/swing/PopupFactory.h
deleted file mode 100644
index 69f15a72a4a..00000000000
--- a/libjava/javax/swing/PopupFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_PopupFactory__
-#define __javax_swing_PopupFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Popup;
-        class PopupFactory;
-    }
-  }
-}
-
-class javax::swing::PopupFactory : public ::java::lang::Object
-{
-
-public:
-  PopupFactory();
-  static void setSharedInstance(::javax::swing::PopupFactory *);
-  static ::javax::swing::PopupFactory * getSharedInstance();
-  virtual ::javax::swing::Popup * getPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
-private:
-  static ::javax::swing::PopupFactory * sharedFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_PopupFactory__
diff --git a/libjava/javax/swing/ProgressMonitor$1.h b/libjava/javax/swing/ProgressMonitor$1.h
deleted file mode 100644
index 75b11921fd2..00000000000
--- a/libjava/javax/swing/ProgressMonitor$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ProgressMonitor$1__
-#define __javax_swing_ProgressMonitor$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ProgressMonitor;
-        class ProgressMonitor$1;
-    }
-  }
-}
-
-class javax::swing::ProgressMonitor$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ProgressMonitor$1(::javax::swing::ProgressMonitor *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::ProgressMonitor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ProgressMonitor$1__
diff --git a/libjava/javax/swing/ProgressMonitor$TimerListener.h b/libjava/javax/swing/ProgressMonitor$TimerListener.h
deleted file mode 100644
index 747fa707d83..00000000000
--- a/libjava/javax/swing/ProgressMonitor$TimerListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ProgressMonitor$TimerListener__
-#define __javax_swing_ProgressMonitor$TimerListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ProgressMonitor;
-        class ProgressMonitor$TimerListener;
-    }
-  }
-}
-
-class javax::swing::ProgressMonitor$TimerListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ProgressMonitor$TimerListener(::javax::swing::ProgressMonitor *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) timestamp;
-  jint lastProgress;
-  jboolean first;
-  ::javax::swing::ProgressMonitor * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ProgressMonitor$TimerListener__
diff --git a/libjava/javax/swing/ProgressMonitor.h b/libjava/javax/swing/ProgressMonitor.h
deleted file mode 100644
index 6f5b072b67f..00000000000
--- a/libjava/javax/swing/ProgressMonitor.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ProgressMonitor__
-#define __javax_swing_ProgressMonitor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JDialog;
-        class JLabel;
-        class JProgressBar;
-        class ProgressMonitor;
-        class Timer;
-    }
-  }
-}
-
-class javax::swing::ProgressMonitor : public ::java::lang::Object
-{
-
-public:
-  ProgressMonitor(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
-  virtual void close();
-  virtual void setProgress(jint);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jboolean isCanceled();
-  virtual jint getMillisToDecideToPopup();
-  virtual void setMillisToDecideToPopup(jint);
-  virtual jint getMillisToPopup();
-  virtual void setMillisToPopup(jint);
-  virtual ::java::lang::String * getNote();
-  virtual void setNote(::java::lang::String *);
-public: // actually package-private
-  virtual void createDialog();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) accessibleContext;
-public: // actually package-private
-  ::java::awt::Component * component;
-  ::java::lang::String * note;
-  ::java::lang::Object * message;
-  jint millisToDecideToPopup;
-  jint millisToPopup;
-  jint min;
-  jint max;
-  jint progress;
-  ::javax::swing::JProgressBar * progressBar;
-  ::javax::swing::JLabel * noteLabel;
-  ::javax::swing::JDialog * progressDialog;
-  ::javax::swing::Timer * timer;
-  jboolean canceled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ProgressMonitor__
diff --git a/libjava/javax/swing/ProgressMonitorInputStream.h b/libjava/javax/swing/ProgressMonitorInputStream.h
deleted file mode 100644
index 2f4f555b8a9..00000000000
--- a/libjava/javax/swing/ProgressMonitorInputStream.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ProgressMonitorInputStream__
-#define __javax_swing_ProgressMonitorInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ProgressMonitor;
-        class ProgressMonitorInputStream;
-    }
-  }
-}
-
-class javax::swing::ProgressMonitorInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  ProgressMonitorInputStream(::java::awt::Component *, ::java::lang::Object *, ::java::io::InputStream *);
-  virtual void reset();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-  virtual void close();
-  virtual ::javax::swing::ProgressMonitor * getProgressMonitor();
-private:
-  void checkMonitorCanceled();
-  ::javax::swing::ProgressMonitor * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) monitor;
-  jint read__;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ProgressMonitorInputStream__
diff --git a/libjava/javax/swing/Renderer.h b/libjava/javax/swing/Renderer.h
deleted file mode 100644
index de6ca6c72d7..00000000000
--- a/libjava/javax/swing/Renderer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Renderer__
-#define __javax_swing_Renderer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Renderer;
-    }
-  }
-}
-
-class javax::swing::Renderer : public ::java::lang::Object
-{
-
-public:
-  virtual void setValue(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::awt::Component * getComponent() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_Renderer__
diff --git a/libjava/javax/swing/RepaintManager$RepaintWorker.h b/libjava/javax/swing/RepaintManager$RepaintWorker.h
deleted file mode 100644
index ba38b995dea..00000000000
--- a/libjava/javax/swing/RepaintManager$RepaintWorker.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_RepaintManager$RepaintWorker__
-#define __javax_swing_RepaintManager$RepaintWorker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class RepaintManager;
-        class RepaintManager$RepaintWorker;
-    }
-  }
-}
-
-class javax::swing::RepaintManager$RepaintWorker : public ::java::lang::Object
-{
-
-public:
-  RepaintManager$RepaintWorker(::javax::swing::RepaintManager *);
-  virtual void setLive(jboolean);
-  virtual jboolean isLive();
-  virtual void run();
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) live;
-  ::javax::swing::RepaintManager * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_RepaintManager$RepaintWorker__
diff --git a/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h b/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h
deleted file mode 100644
index 7b68871bd36..00000000000
--- a/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_RepaintManager$RepaintWorkerEvent__
-#define __javax_swing_RepaintManager$RepaintWorkerEvent__
-
-#pragma interface
-
-#include <java/awt/event/InvocationEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class RepaintManager$RepaintWorkerEvent;
-    }
-  }
-}
-
-class javax::swing::RepaintManager$RepaintWorkerEvent : public ::java::awt::event::InvocationEvent
-{
-
-public:
-  RepaintManager$RepaintWorkerEvent(::java::lang::Object *, ::java::lang::Runnable *, ::java::lang::Object *, jboolean);
-  virtual void dispatch();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_RepaintManager$RepaintWorkerEvent__
diff --git a/libjava/javax/swing/RepaintManager.h b/libjava/javax/swing/RepaintManager.h
deleted file mode 100644
index c599a47cc79..00000000000
--- a/libjava/javax/swing/RepaintManager.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_RepaintManager__
-#define __javax_swing_RepaintManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Image;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class RepaintManager;
-        class RepaintManager$RepaintWorker;
-    }
-  }
-}
-
-class javax::swing::RepaintManager : public ::java::lang::Object
-{
-
-public:
-  RepaintManager();
-  static ::javax::swing::RepaintManager * currentManager(::java::awt::Component *);
-  static ::javax::swing::RepaintManager * currentManager(::javax::swing::JComponent *);
-  static void setCurrentManager(::javax::swing::RepaintManager *);
-  virtual void addInvalidComponent(::javax::swing::JComponent *);
-  virtual void removeInvalidComponent(::javax::swing::JComponent *);
-  virtual void addDirtyRegion(::javax::swing::JComponent *, jint, jint, jint, jint);
-  virtual ::java::awt::Rectangle * getDirtyRegion(::javax::swing::JComponent *);
-  virtual void markCompletelyDirty(::javax::swing::JComponent *);
-  virtual void markCompletelyClean(::javax::swing::JComponent *);
-  virtual jboolean isCompletelyDirty(::javax::swing::JComponent *);
-  virtual void validateInvalidComponents();
-  virtual void paintDirtyRegions();
-private:
-  void compileRepaintRoots(::java::util::HashMap *, ::javax::swing::JComponent *, ::java::util::HashSet *);
-public:
-  virtual ::java::awt::Image * getOffscreenBuffer(::java::awt::Component *, jint, jint);
-public: // actually package-private
-  virtual void commitBuffer(::java::awt::Component *, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Image * getVolatileOffscreenBuffer(::java::awt::Component *, jint, jint);
-  virtual ::java::awt::Dimension * getDoubleBufferMaximumSize();
-  virtual void setDoubleBufferMaximumSize(::java::awt::Dimension *);
-  virtual void setDoubleBufferingEnabled(jboolean);
-  virtual jboolean isDoubleBufferingEnabled();
-  virtual ::java::lang::String * toString();
-private:
-  void invokeLater(::java::lang::Runnable *);
-public: // actually package-private
-  static ::java::util::WeakHashMap * currentRepaintManagers;
-private:
-  static ::java::awt::Rectangle * rectCache;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dirtyComponents;
-  ::java::util::HashMap * dirtyComponentsWork;
-  ::javax::swing::RepaintManager$RepaintWorker * repaintWorker;
-  ::java::util::ArrayList * invalidComponents;
-  jboolean doubleBufferingEnabled;
-  ::java::util::WeakHashMap * offscreenBuffers;
-  ::java::awt::Dimension * doubleBufferMaximumSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_RepaintManager__
diff --git a/libjava/javax/swing/RootPaneContainer.h b/libjava/javax/swing/RootPaneContainer.h
deleted file mode 100644
index 9318d8bc174..00000000000
--- a/libjava/javax/swing/RootPaneContainer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_RootPaneContainer__
-#define __javax_swing_RootPaneContainer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JLayeredPane;
-        class JRootPane;
-        class RootPaneContainer;
-    }
-  }
-}
-
-class javax::swing::RootPaneContainer : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::JRootPane * getRootPane() = 0;
-  virtual void setContentPane(::java::awt::Container *) = 0;
-  virtual ::java::awt::Container * getContentPane() = 0;
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *) = 0;
-  virtual ::javax::swing::JLayeredPane * getLayeredPane() = 0;
-  virtual void setGlassPane(::java::awt::Component *) = 0;
-  virtual ::java::awt::Component * getGlassPane() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_RootPaneContainer__
diff --git a/libjava/javax/swing/ScrollPaneConstants.h b/libjava/javax/swing/ScrollPaneConstants.h
deleted file mode 100644
index 830a49f0229..00000000000
--- a/libjava/javax/swing/ScrollPaneConstants.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ScrollPaneConstants__
-#define __javax_swing_ScrollPaneConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ScrollPaneConstants;
-    }
-  }
-}
-
-class javax::swing::ScrollPaneConstants : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * VIEWPORT;
-  static ::java::lang::String * VERTICAL_SCROLLBAR;
-  static ::java::lang::String * HORIZONTAL_SCROLLBAR;
-  static ::java::lang::String * ROW_HEADER;
-  static ::java::lang::String * COLUMN_HEADER;
-  static ::java::lang::String * LOWER_LEFT_CORNER;
-  static ::java::lang::String * LOWER_RIGHT_CORNER;
-  static ::java::lang::String * UPPER_LEFT_CORNER;
-  static ::java::lang::String * UPPER_RIGHT_CORNER;
-  static ::java::lang::String * LOWER_LEADING_CORNER;
-  static ::java::lang::String * LOWER_TRAILING_CORNER;
-  static ::java::lang::String * UPPER_LEADING_CORNER;
-  static ::java::lang::String * UPPER_TRAILING_CORNER;
-  static ::java::lang::String * VERTICAL_SCROLLBAR_POLICY;
-  static ::java::lang::String * HORIZONTAL_SCROLLBAR_POLICY;
-  static const jint VERTICAL_SCROLLBAR_AS_NEEDED = 20;
-  static const jint VERTICAL_SCROLLBAR_NEVER = 21;
-  static const jint VERTICAL_SCROLLBAR_ALWAYS = 22;
-  static const jint HORIZONTAL_SCROLLBAR_AS_NEEDED = 30;
-  static const jint HORIZONTAL_SCROLLBAR_NEVER = 31;
-  static const jint HORIZONTAL_SCROLLBAR_ALWAYS = 32;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ScrollPaneConstants__
diff --git a/libjava/javax/swing/ScrollPaneLayout$UIResource.h b/libjava/javax/swing/ScrollPaneLayout$UIResource.h
deleted file mode 100644
index 24c0fab6487..00000000000
--- a/libjava/javax/swing/ScrollPaneLayout$UIResource.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ScrollPaneLayout$UIResource__
-#define __javax_swing_ScrollPaneLayout$UIResource__
-
-#pragma interface
-
-#include <javax/swing/ScrollPaneLayout.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ScrollPaneLayout$UIResource;
-    }
-  }
-}
-
-class javax::swing::ScrollPaneLayout$UIResource : public ::javax::swing::ScrollPaneLayout
-{
-
-public:
-  ScrollPaneLayout$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ScrollPaneLayout$UIResource__
diff --git a/libjava/javax/swing/ScrollPaneLayout.h b/libjava/javax/swing/ScrollPaneLayout.h
deleted file mode 100644
index d0fe8178019..00000000000
--- a/libjava/javax/swing/ScrollPaneLayout.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ScrollPaneLayout__
-#define __javax_swing_ScrollPaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollPane;
-        class JViewport;
-        class ScrollPaneLayout;
-    }
-  }
-}
-
-class javax::swing::ScrollPaneLayout : public ::java::lang::Object
-{
-
-public:
-  ScrollPaneLayout();
-  virtual void syncWithScrollPane(::javax::swing::JScrollPane *);
-public: // actually protected
-  virtual ::java::awt::Component * addSingletonComponent(::java::awt::Component *, ::java::awt::Component *);
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual jint getVerticalScrollBarPolicy();
-  virtual void setVerticalScrollBarPolicy(jint);
-  virtual jint getHorizontalScrollBarPolicy();
-  virtual void setHorizontalScrollBarPolicy(jint);
-  virtual ::javax::swing::JViewport * getViewport();
-  virtual ::javax::swing::JScrollBar * getHorizontalScrollBar();
-  virtual ::javax::swing::JScrollBar * getVerticalScrollBar();
-  virtual ::javax::swing::JViewport * getRowHeader();
-  virtual ::javax::swing::JViewport * getColumnHeader();
-  virtual ::java::awt::Component * getCorner(::java::lang::String *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Rectangle * getViewportBorderBounds(::javax::swing::JScrollPane *);
-private:
-  static const jlong serialVersionUID = -4480022884523193743LL;
-public: // actually protected
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::java::lang::Object)))) viewport;
-  ::javax::swing::JScrollBar * vsb;
-  ::javax::swing::JScrollBar * hsb;
-  ::javax::swing::JViewport * rowHead;
-  ::javax::swing::JViewport * colHead;
-  ::java::awt::Component * lowerLeft;
-  ::java::awt::Component * lowerRight;
-  ::java::awt::Component * upperLeft;
-  ::java::awt::Component * upperRight;
-  jint vsbPolicy;
-  jint hsbPolicy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ScrollPaneLayout__
diff --git a/libjava/javax/swing/Scrollable.h b/libjava/javax/swing/Scrollable.h
deleted file mode 100644
index 7030c9265f7..00000000000
--- a/libjava/javax/swing/Scrollable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Scrollable__
-#define __javax_swing_Scrollable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Scrollable;
-    }
-  }
-}
-
-class javax::swing::Scrollable : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize() = 0;
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint) = 0;
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint) = 0;
-  virtual jboolean getScrollableTracksViewportWidth() = 0;
-  virtual jboolean getScrollableTracksViewportHeight() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_Scrollable__
diff --git a/libjava/javax/swing/SingleSelectionModel.h b/libjava/javax/swing/SingleSelectionModel.h
deleted file mode 100644
index f8120e1116a..00000000000
--- a/libjava/javax/swing/SingleSelectionModel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SingleSelectionModel__
-#define __javax_swing_SingleSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SingleSelectionModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::SingleSelectionModel : public ::java::lang::Object
-{
-
-public:
-  virtual jint getSelectedIndex() = 0;
-  virtual void setSelectedIndex(jint) = 0;
-  virtual void clearSelection() = 0;
-  virtual jboolean isSelected() = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_SingleSelectionModel__
diff --git a/libjava/javax/swing/SizeRequirements.h b/libjava/javax/swing/SizeRequirements.h
deleted file mode 100644
index 7a9672a77a7..00000000000
--- a/libjava/javax/swing/SizeRequirements.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SizeRequirements__
-#define __javax_swing_SizeRequirements__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-    }
-  }
-}
-
-class javax::swing::SizeRequirements : public ::java::lang::Object
-{
-
-public:
-  SizeRequirements();
-  SizeRequirements(jint, jint, jint, jfloat);
-  virtual ::java::lang::String * toString();
-  static ::javax::swing::SizeRequirements * getTiledSizeRequirements(JArray< ::javax::swing::SizeRequirements * > *);
-  static ::javax::swing::SizeRequirements * getAlignedSizeRequirements(JArray< ::javax::swing::SizeRequirements * > *);
-  static void calculateTiledPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *);
-  static void calculateTiledPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *, jboolean);
-private:
-  static void adjustSmaller(jint, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, jint);
-  static void adjustGreater(jint, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, jint);
-public:
-  static void calculateAlignedPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *);
-  static void calculateAlignedPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *, jboolean);
-private:
-  static void adjustFromRight(::javax::swing::SizeRequirements *, jfloat, jint, JArray< jint > *);
-  static void adjustFromLeft(::javax::swing::SizeRequirements *, jfloat, jint, JArray< jint > *);
-public:
-  static JArray< jint > * adjustSizes(jint, JArray< ::javax::swing::SizeRequirements * > *);
-private:
-  static const jlong serialVersionUID = 9217749429906736553LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) minimum;
-  jint preferred;
-  jint maximum;
-  jfloat alignment;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SizeRequirements__
diff --git a/libjava/javax/swing/SizeSequence.h b/libjava/javax/swing/SizeSequence.h
deleted file mode 100644
index 8bae12cf6af..00000000000
--- a/libjava/javax/swing/SizeSequence.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SizeSequence__
-#define __javax_swing_SizeSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeSequence;
-    }
-  }
-}
-
-class javax::swing::SizeSequence : public ::java::lang::Object
-{
-
-public:
-  SizeSequence();
-  SizeSequence(jint);
-  SizeSequence(jint, jint);
-  SizeSequence(JArray< jint > *);
-  virtual void setSize(jint, jint);
-  virtual jint getIndex(jint);
-  virtual jint getSize(jint);
-  virtual void setSizes(JArray< jint > *);
-  virtual JArray< jint > * getSizes();
-  virtual jint getPosition(jint);
-  virtual void insertEntries(jint, jint, jint);
-  virtual void removeEntries(jint, jint);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sizes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SizeSequence__
diff --git a/libjava/javax/swing/SortingFocusTraversalPolicy.h b/libjava/javax/swing/SortingFocusTraversalPolicy.h
deleted file mode 100644
index fc3d570b66f..00000000000
--- a/libjava/javax/swing/SortingFocusTraversalPolicy.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SortingFocusTraversalPolicy__
-#define __javax_swing_SortingFocusTraversalPolicy__
-
-#pragma interface
-
-#include <javax/swing/InternalFrameFocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SortingFocusTraversalPolicy;
-    }
-  }
-}
-
-class javax::swing::SortingFocusTraversalPolicy : public ::javax::swing::InternalFrameFocusTraversalPolicy
-{
-
-public: // actually protected
-  SortingFocusTraversalPolicy();
-public:
-  SortingFocusTraversalPolicy(::java::util::Comparator *);
-public: // actually protected
-  virtual jboolean accept(::java::awt::Component *);
-  virtual ::java::util::Comparator * getComparator();
-  virtual void setComparator(::java::util::Comparator *);
-private:
-  ::java::util::TreeSet * getSortedCycle(::java::awt::Container *, ::java::util::TreeSet *);
-public:
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
-  virtual jboolean getImplicitDownCycleTraversal();
-  virtual void setImplicitDownCycleTraversal(jboolean);
-public: // actually package-private
-  ::java::util::Comparator * __attribute__((aligned(__alignof__( ::javax::swing::InternalFrameFocusTraversalPolicy)))) comparator;
-  jboolean implicitDownCycleTraversal;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SortingFocusTraversalPolicy__
diff --git a/libjava/javax/swing/SpinnerDateModel.h b/libjava/javax/swing/SpinnerDateModel.h
deleted file mode 100644
index ae25fbe4c82..00000000000
--- a/libjava/javax/swing/SpinnerDateModel.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpinnerDateModel__
-#define __javax_swing_SpinnerDateModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractSpinnerModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpinnerDateModel;
-    }
-  }
-}
-
-class javax::swing::SpinnerDateModel : public ::javax::swing::AbstractSpinnerModel
-{
-
-public:
-  SpinnerDateModel();
-  SpinnerDateModel(::java::util::Date *, ::java::lang::Comparable *, ::java::lang::Comparable *, jint);
-  virtual jint getCalendarField();
-  virtual ::java::util::Date * getDate();
-  virtual ::java::lang::Comparable * getStart();
-  virtual ::java::lang::Comparable * getEnd();
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::Object * getNextValue();
-  virtual ::java::lang::Object * getPreviousValue();
-  virtual void setCalendarField(jint);
-  virtual void setStart(::java::lang::Comparable *);
-  virtual void setEnd(::java::lang::Comparable *);
-  virtual void setValue(::java::lang::Object *);
-private:
-  ::java::util::Calendar * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) date;
-  ::java::lang::Comparable * start;
-  ::java::lang::Comparable * end;
-  jint calendarField;
-  static const jlong serialVersionUID = -4802518107105940612LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpinnerDateModel__
diff --git a/libjava/javax/swing/SpinnerListModel.h b/libjava/javax/swing/SpinnerListModel.h
deleted file mode 100644
index b5a65939ede..00000000000
--- a/libjava/javax/swing/SpinnerListModel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpinnerListModel__
-#define __javax_swing_SpinnerListModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractSpinnerModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpinnerListModel;
-    }
-  }
-}
-
-class javax::swing::SpinnerListModel : public ::javax::swing::AbstractSpinnerModel
-{
-
-public:
-  SpinnerListModel();
-  SpinnerListModel(::java::util::List *);
-  SpinnerListModel(JArray< ::java::lang::Object * > *);
-  virtual ::java::util::List * getList();
-  virtual ::java::lang::Object * getNextValue();
-  virtual ::java::lang::Object * getPreviousValue();
-  virtual ::java::lang::Object * getValue();
-  virtual void setList(::java::util::List *);
-  virtual void setValue(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 3358804052191994516LL;
-  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) list;
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpinnerListModel__
diff --git a/libjava/javax/swing/SpinnerModel.h b/libjava/javax/swing/SpinnerModel.h
deleted file mode 100644
index c762ac64a68..00000000000
--- a/libjava/javax/swing/SpinnerModel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpinnerModel__
-#define __javax_swing_SpinnerModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpinnerModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::SpinnerModel : public ::java::lang::Object
-{
-
-public:
-  virtual void setValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getValue() = 0;
-  virtual ::java::lang::Object * getNextValue() = 0;
-  virtual ::java::lang::Object * getPreviousValue() = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_SpinnerModel__
diff --git a/libjava/javax/swing/SpinnerNumberModel.h b/libjava/javax/swing/SpinnerNumberModel.h
deleted file mode 100644
index 185205472f8..00000000000
--- a/libjava/javax/swing/SpinnerNumberModel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpinnerNumberModel__
-#define __javax_swing_SpinnerNumberModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractSpinnerModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpinnerNumberModel;
-    }
-  }
-}
-
-class javax::swing::SpinnerNumberModel : public ::javax::swing::AbstractSpinnerModel
-{
-
-public:
-  SpinnerNumberModel();
-  SpinnerNumberModel(jdouble, jdouble, jdouble, jdouble);
-  SpinnerNumberModel(jint, jint, jint, jint);
-  SpinnerNumberModel(::java::lang::Number *, ::java::lang::Comparable *, ::java::lang::Comparable *, ::java::lang::Number *);
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::Object * getNextValue();
-  virtual ::java::lang::Object * getPreviousValue();
-  virtual ::java::lang::Number * getNumber();
-  virtual ::java::lang::Comparable * getMinimum();
-  virtual void setMinimum(::java::lang::Comparable *);
-  virtual ::java::lang::Comparable * getMaximum();
-  virtual void setMaximum(::java::lang::Comparable *);
-  virtual ::java::lang::Number * getStepSize();
-  virtual void setStepSize(::java::lang::Number *);
-private:
-  static const jlong serialVersionUID = 7279176385485777821LL;
-  ::java::lang::Number * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) value;
-  ::java::lang::Comparable * minimum;
-  ::java::lang::Comparable * maximum;
-  ::java::lang::Number * stepSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpinnerNumberModel__
diff --git a/libjava/javax/swing/Spring$1.h b/libjava/javax/swing/Spring$1.h
deleted file mode 100644
index 5d5dd90abe8..00000000000
--- a/libjava/javax/swing/Spring$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$1__
-#define __javax_swing_Spring$1__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class Spring$1;
-    }
-  }
-}
-
-class javax::swing::Spring$1 : public ::javax::swing::Spring
-{
-
-public: // actually package-private
-  Spring$1(jfloat, ::javax::swing::Spring *);
-public:
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-  virtual jint getValue();
-  virtual void setValue(jint);
-private:
-  jfloat __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$factor;
-  ::javax::swing::Spring * val$spring;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$1__
diff --git a/libjava/javax/swing/Spring$2.h b/libjava/javax/swing/Spring$2.h
deleted file mode 100644
index acfc8884b22..00000000000
--- a/libjava/javax/swing/Spring$2.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$2__
-#define __javax_swing_Spring$2__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring$2;
-    }
-  }
-}
-
-class javax::swing::Spring$2 : public ::javax::swing::Spring
-{
-
-public: // actually package-private
-  Spring$2(::java::awt::Component *);
-public:
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-  virtual jint getValue();
-  virtual void setValue(jint);
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$component;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$2__
diff --git a/libjava/javax/swing/Spring$3.h b/libjava/javax/swing/Spring$3.h
deleted file mode 100644
index 74b820aba23..00000000000
--- a/libjava/javax/swing/Spring$3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$3__
-#define __javax_swing_Spring$3__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring$3;
-    }
-  }
-}
-
-class javax::swing::Spring$3 : public ::javax::swing::Spring
-{
-
-public: // actually package-private
-  Spring$3(::java::awt::Component *);
-public:
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-  virtual jint getValue();
-  virtual void setValue(jint);
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$component;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$3__
diff --git a/libjava/javax/swing/Spring$AddSpring.h b/libjava/javax/swing/Spring$AddSpring.h
deleted file mode 100644
index 9c455fead45..00000000000
--- a/libjava/javax/swing/Spring$AddSpring.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$AddSpring__
-#define __javax_swing_Spring$AddSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class Spring$AddSpring;
-    }
-  }
-}
-
-class javax::swing::Spring$AddSpring : public ::javax::swing::Spring
-{
-
-public:
-  ::java::lang::String * toString();
-public: // actually protected
-  Spring$AddSpring(::javax::swing::Spring *, ::javax::swing::Spring *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s1;
-  ::javax::swing::Spring * s2;
-  jint value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$AddSpring__
diff --git a/libjava/javax/swing/Spring$MaxSpring.h b/libjava/javax/swing/Spring$MaxSpring.h
deleted file mode 100644
index c3272b2ce78..00000000000
--- a/libjava/javax/swing/Spring$MaxSpring.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$MaxSpring__
-#define __javax_swing_Spring$MaxSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class Spring$MaxSpring;
-    }
-  }
-}
-
-class javax::swing::Spring$MaxSpring : public ::javax::swing::Spring
-{
-
-public:
-  ::java::lang::String * toString();
-public: // actually protected
-  Spring$MaxSpring(::javax::swing::Spring *, ::javax::swing::Spring *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s1;
-  ::javax::swing::Spring * s2;
-  jint value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$MaxSpring__
diff --git a/libjava/javax/swing/Spring$MinusSpring.h b/libjava/javax/swing/Spring$MinusSpring.h
deleted file mode 100644
index 7b74f661301..00000000000
--- a/libjava/javax/swing/Spring$MinusSpring.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$MinusSpring__
-#define __javax_swing_Spring$MinusSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class Spring$MinusSpring;
-    }
-  }
-}
-
-class javax::swing::Spring$MinusSpring : public ::javax::swing::Spring
-{
-
-public:
-  ::java::lang::String * toString();
-public: // actually protected
-  Spring$MinusSpring(::javax::swing::Spring *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$MinusSpring__
diff --git a/libjava/javax/swing/Spring$SimpleSpring.h b/libjava/javax/swing/Spring$SimpleSpring.h
deleted file mode 100644
index b28437cca0f..00000000000
--- a/libjava/javax/swing/Spring$SimpleSpring.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$SimpleSpring__
-#define __javax_swing_Spring$SimpleSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring$SimpleSpring;
-    }
-  }
-}
-
-class javax::swing::Spring$SimpleSpring : public ::javax::swing::Spring
-{
-
-public:
-  ::java::lang::String * toString();
-  Spring$SimpleSpring(jint, jint, jint);
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) min;
-  jint pref;
-  jint max;
-  jint value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$SimpleSpring__
diff --git a/libjava/javax/swing/Spring.h b/libjava/javax/swing/Spring.h
deleted file mode 100644
index 9459f630f8e..00000000000
--- a/libjava/javax/swing/Spring.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring__
-#define __javax_swing_Spring__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-    }
-  }
-}
-
-class javax::swing::Spring : public ::java::lang::Object
-{
-
-public: // actually protected
-  Spring();
-public:
-  static ::javax::swing::Spring * constant(jint);
-  static ::javax::swing::Spring * constant(jint, jint, jint);
-  virtual jint getMaximumValue() = 0;
-  virtual jint getMinimumValue() = 0;
-  virtual jint getPreferredValue() = 0;
-  virtual jint getValue() = 0;
-  static ::javax::swing::Spring * max(::javax::swing::Spring *, ::javax::swing::Spring *);
-  static ::javax::swing::Spring * minus(::javax::swing::Spring *);
-  virtual void setValue(jint) = 0;
-private:
-  jint getShrinkRange();
-  jint getExpandRange();
-public: // actually package-private
-  virtual jdouble getStrain();
-  virtual void setStrain(jdouble);
-public:
-  static ::javax::swing::Spring * sum(::javax::swing::Spring *, ::javax::swing::Spring *);
-  static ::javax::swing::Spring * scale(::javax::swing::Spring *, jfloat);
-  static ::javax::swing::Spring * width(::java::awt::Component *);
-  static ::javax::swing::Spring * height(::java::awt::Component *);
-  static const jint UNSET = -2147483647 - 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring__
diff --git a/libjava/javax/swing/SpringLayout$Constraints.h b/libjava/javax/swing/SpringLayout$Constraints.h
deleted file mode 100644
index 200318910d6..00000000000
--- a/libjava/javax/swing/SpringLayout$Constraints.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$Constraints__
-#define __javax_swing_SpringLayout$Constraints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class SpringLayout$Constraints;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$Constraints : public ::java::lang::Object
-{
-
-public:
-  SpringLayout$Constraints();
-  SpringLayout$Constraints(::javax::swing::Spring *, ::javax::swing::Spring *);
-  SpringLayout$Constraints(::javax::swing::Spring *, ::javax::swing::Spring *, ::javax::swing::Spring *, ::javax::swing::Spring *);
-  SpringLayout$Constraints(::java::awt::Component *);
-  virtual ::javax::swing::Spring * getConstraint(::java::lang::String *);
-  virtual ::javax::swing::Spring * getHeight();
-  virtual ::javax::swing::Spring * getWidth();
-  virtual ::javax::swing::Spring * getX();
-  virtual ::javax::swing::Spring * getY();
-  virtual ::javax::swing::Spring * getSouth();
-  virtual ::javax::swing::Spring * getEast();
-  virtual void setConstraint(::java::lang::String *, ::javax::swing::Spring *);
-  virtual void setHeight(::javax::swing::Spring *);
-  virtual void setWidth(::javax::swing::Spring *);
-  virtual void setX(::javax::swing::Spring *);
-  virtual void setY(::javax::swing::Spring *);
-  virtual void setSouth(::javax::swing::Spring *);
-  virtual void setEast(::javax::swing::Spring *);
-  virtual void dropCalcResult();
-private:
-  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  ::javax::swing::Spring * y;
-  ::javax::swing::Spring * height;
-  ::javax::swing::Spring * width;
-  ::javax::swing::Spring * east;
-  ::javax::swing::Spring * south;
-  ::javax::swing::Spring * v;
-  ::javax::swing::Spring * h;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$Constraints__
diff --git a/libjava/javax/swing/SpringLayout$DeferredDimension.h b/libjava/javax/swing/SpringLayout$DeferredDimension.h
deleted file mode 100644
index 0d72960b284..00000000000
--- a/libjava/javax/swing/SpringLayout$DeferredDimension.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$DeferredDimension__
-#define __javax_swing_SpringLayout$DeferredDimension__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpringLayout$DeferredDimension;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$DeferredDimension : public ::javax::swing::Spring
-{
-
-public:
-  SpringLayout$DeferredDimension();
-  virtual void setValue(jint);
-  virtual jint getValue();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$DeferredDimension__
diff --git a/libjava/javax/swing/SpringLayout$DeferredHeight.h b/libjava/javax/swing/SpringLayout$DeferredHeight.h
deleted file mode 100644
index c08de85b630..00000000000
--- a/libjava/javax/swing/SpringLayout$DeferredHeight.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$DeferredHeight__
-#define __javax_swing_SpringLayout$DeferredHeight__
-
-#pragma interface
-
-#include <javax/swing/SpringLayout$DeferredDimension.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpringLayout$DeferredHeight;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$DeferredHeight : public ::javax::swing::SpringLayout$DeferredDimension
-{
-
-public:
-  virtual ::java::lang::String * toString();
-  SpringLayout$DeferredHeight(::java::awt::Component *);
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::SpringLayout$DeferredDimension)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$DeferredHeight__
diff --git a/libjava/javax/swing/SpringLayout$DeferredSpring.h b/libjava/javax/swing/SpringLayout$DeferredSpring.h
deleted file mode 100644
index 691515408ff..00000000000
--- a/libjava/javax/swing/SpringLayout$DeferredSpring.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$DeferredSpring__
-#define __javax_swing_SpringLayout$DeferredSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class SpringLayout;
-        class SpringLayout$DeferredSpring;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$DeferredSpring : public ::javax::swing::Spring
-{
-
-public:
-  virtual ::java::lang::String * toString();
-  SpringLayout$DeferredSpring(::javax::swing::SpringLayout *, ::java::lang::String *, ::java::awt::Component *);
-private:
-  ::javax::swing::Spring * resolveSpring();
-public:
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-  virtual jint getValue();
-  virtual void setValue(jint);
-private:
-  ::javax::swing::SpringLayout * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) sl;
-  ::java::lang::String * edgeName;
-  ::java::awt::Component * c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$DeferredSpring__
diff --git a/libjava/javax/swing/SpringLayout$DeferredWidth.h b/libjava/javax/swing/SpringLayout$DeferredWidth.h
deleted file mode 100644
index fea7e4959ff..00000000000
--- a/libjava/javax/swing/SpringLayout$DeferredWidth.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$DeferredWidth__
-#define __javax_swing_SpringLayout$DeferredWidth__
-
-#pragma interface
-
-#include <javax/swing/SpringLayout$DeferredDimension.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpringLayout$DeferredWidth;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$DeferredWidth : public ::javax::swing::SpringLayout$DeferredDimension
-{
-
-public:
-  SpringLayout$DeferredWidth(::java::awt::Component *);
-  virtual ::java::lang::String * toString();
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::SpringLayout$DeferredDimension)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$DeferredWidth__
diff --git a/libjava/javax/swing/SpringLayout.h b/libjava/javax/swing/SpringLayout.h
deleted file mode 100644
index 426d0d84972..00000000000
--- a/libjava/javax/swing/SpringLayout.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout__
-#define __javax_swing_SpringLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class SpringLayout;
-        class SpringLayout$Constraints;
-    }
-  }
-}
-
-class javax::swing::SpringLayout : public ::java::lang::Object
-{
-
-public:
-  SpringLayout();
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual ::javax::swing::Spring * getConstraint(::java::lang::String *, ::java::awt::Component *);
-  virtual ::javax::swing::SpringLayout$Constraints * getConstraints(::java::awt::Component *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-private:
-  ::javax::swing::SpringLayout$Constraints * initContainer(::java::awt::Container *);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void putConstraint(::java::lang::String *, ::java::awt::Component *, jint, ::java::lang::String *, ::java::awt::Component *);
-  virtual void putConstraint(::java::lang::String *, ::java::awt::Component *, ::javax::swing::Spring *, ::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  static ::java::lang::String * EAST;
-  static ::java::lang::String * NORTH;
-  static ::java::lang::String * SOUTH;
-  static ::java::lang::String * WEST;
-private:
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) constraintsMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout__
diff --git a/libjava/javax/swing/SwingConstants.h b/libjava/javax/swing/SwingConstants.h
deleted file mode 100644
index 7ca0a9bcf8e..00000000000
--- a/libjava/javax/swing/SwingConstants.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SwingConstants__
-#define __javax_swing_SwingConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SwingConstants;
-    }
-  }
-}
-
-class javax::swing::SwingConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint CENTER = 0;
-  static const jint TOP = 1;
-  static const jint LEFT = 2;
-  static const jint BOTTOM = 3;
-  static const jint RIGHT = 4;
-  static const jint NORTH = 1;
-  static const jint NORTH_EAST = 2;
-  static const jint EAST = 3;
-  static const jint SOUTH_EAST = 4;
-  static const jint SOUTH = 5;
-  static const jint SOUTH_WEST = 6;
-  static const jint WEST = 7;
-  static const jint NORTH_WEST = 8;
-  static const jint HORIZONTAL = 0;
-  static const jint VERTICAL = 1;
-  static const jint LEADING = 10;
-  static const jint TRAILING = 11;
-  static const jint NEXT = 12;
-  static const jint PREVIOUS = 13;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_SwingConstants__
diff --git a/libjava/javax/swing/SwingUtilities$OwnerFrame.h b/libjava/javax/swing/SwingUtilities$OwnerFrame.h
deleted file mode 100644
index deb4d8412aa..00000000000
--- a/libjava/javax/swing/SwingUtilities$OwnerFrame.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SwingUtilities$OwnerFrame__
-#define __javax_swing_SwingUtilities$OwnerFrame__
-
-#pragma interface
-
-#include <java/awt/Frame.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SwingUtilities$OwnerFrame;
-    }
-  }
-}
-
-class javax::swing::SwingUtilities$OwnerFrame : public ::java::awt::Frame
-{
-
-  SwingUtilities$OwnerFrame();
-public:
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-public: // actually package-private
-  SwingUtilities$OwnerFrame(::javax::swing::SwingUtilities$OwnerFrame *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SwingUtilities$OwnerFrame__
diff --git a/libjava/javax/swing/SwingUtilities.h b/libjava/javax/swing/SwingUtilities.h
deleted file mode 100644
index 3f75d967f72..00000000000
--- a/libjava/javax/swing/SwingUtilities.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SwingUtilities__
-#define __javax_swing_SwingUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class FontMetrics;
-        class Graphics;
-        class Point;
-        class Rectangle;
-        class Window;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class Action;
-        class ActionMap;
-        class Icon;
-        class InputMap;
-        class JComponent;
-        class JRootPane;
-        class KeyStroke;
-        class SwingUtilities;
-        class SwingUtilities$OwnerFrame;
-    }
-  }
-}
-
-class javax::swing::SwingUtilities : public ::java::lang::Object
-{
-
-  SwingUtilities();
-public:
-  static ::java::awt::Rectangle * calculateInnerArea(::javax::swing::JComponent *, ::java::awt::Rectangle *);
-  static ::java::awt::Component * findFocusOwner(::java::awt::Component *);
-  static ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Component *, ::java::awt::Point *);
-  static ::javax::accessibility::Accessible * getAccessibleChild(::java::awt::Component *, jint);
-  static jint getAccessibleChildrenCount(::java::awt::Component *);
-  static jint getAccessibleIndexInParent(::java::awt::Component *);
-  static ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet(::java::awt::Component *);
-  static ::java::awt::Rectangle * getLocalBounds(::java::awt::Component *);
-  static ::javax::swing::JRootPane * getRootPane(::java::awt::Component *);
-  static ::java::awt::Container * getAncestorNamed(::java::lang::String *, ::java::awt::Component *);
-  static ::java::awt::Container * getAncestorOfClass(::java::lang::Class *, ::java::awt::Component *);
-  static ::java::awt::Window * getWindowAncestor(::java::awt::Component *);
-  static ::java::awt::Window * windowForComponent(::java::awt::Component *);
-  static ::java::awt::Component * getRoot(::java::awt::Component *);
-  static jboolean isDescendingFrom(::java::awt::Component *, ::java::awt::Component *);
-  static ::java::awt::Component * getDeepestComponentAt(::java::awt::Component *, jint, jint);
-  static void convertPointToScreen(::java::awt::Point *, ::java::awt::Component *);
-  static void convertPointFromScreen(::java::awt::Point *, ::java::awt::Component *);
-  static ::java::awt::Point * convertPoint(::java::awt::Component *, jint, jint, ::java::awt::Component *);
-  static ::java::awt::Point * convertPoint(::java::awt::Component *, ::java::awt::Point *, ::java::awt::Component *);
-  static ::java::awt::Rectangle * convertRectangle(::java::awt::Component *, ::java::awt::Rectangle *, ::java::awt::Component *);
-  static ::java::awt::event::MouseEvent * convertMouseEvent(::java::awt::Component *, ::java::awt::event::MouseEvent *, ::java::awt::Component *);
-  static void updateComponentTreeUI(::java::awt::Component *);
-private:
-  static void updateComponentTreeUIImpl(::java::awt::Component *);
-public:
-  static ::java::lang::String * layoutCompoundLabel(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
-  static ::java::lang::String * layoutCompoundLabel(::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
-private:
-  static ::java::lang::String * layoutCompoundLabelImpl(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
-  static ::java::lang::String * clipString(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, jint);
-public:
-  static void invokeLater(::java::lang::Runnable *);
-  static void invokeAndWait(::java::lang::Runnable *);
-  static jboolean isEventDispatchThread();
-  static void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint);
-  static void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, ::java::awt::Rectangle *);
-public: // actually package-private
-  static ::java::awt::Window * getOwnerFrame(::java::awt::Window *);
-public:
-  static jboolean isLeftMouseButton(::java::awt::event::MouseEvent *);
-  static jboolean isMiddleMouseButton(::java::awt::event::MouseEvent *);
-  static jboolean isRightMouseButton(::java::awt::event::MouseEvent *);
-  static jboolean notifyAction(::javax::swing::Action *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, ::java::lang::Object *, jint);
-  static void replaceUIActionMap(::javax::swing::JComponent *, ::javax::swing::ActionMap *);
-  static void replaceUIInputMap(::javax::swing::JComponent *, jint, ::javax::swing::InputMap *);
-  static JArray< ::java::awt::Rectangle * > * computeDifference(::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
-  static jint computeStringWidth(::java::awt::FontMetrics *, ::java::lang::String *);
-  static ::java::awt::Rectangle * computeUnion(jint, jint, jint, jint, ::java::awt::Rectangle *);
-  static jboolean isRectangleContainingRectangle(::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  static ::javax::swing::InputMap * getUIInputMap(::javax::swing::JComponent *, jint);
-  static ::javax::swing::ActionMap * getUIActionMap(::javax::swing::JComponent *);
-  static jboolean processKeyBindings(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  static ::java::lang::String * convertHorizontalAlignmentCodeToString(jint);
-  static ::java::lang::String * convertVerticalAlignmentCodeToString(jint);
-  static ::java::lang::String * convertWindowConstantToString(jint);
-  static void convertRectangleToAncestor(::java::awt::Component *, ::java::awt::Rectangle *, ::java::awt::Component *);
-private:
-  static ::javax::swing::SwingUtilities$OwnerFrame * ownerFrame;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SwingUtilities__
diff --git a/libjava/javax/swing/Timer$1.h b/libjava/javax/swing/Timer$1.h
deleted file mode 100644
index 0f4e056dc69..00000000000
--- a/libjava/javax/swing/Timer$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Timer$1__
-#define __javax_swing_Timer$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-        class Timer$1;
-    }
-  }
-}
-
-class javax::swing::Timer$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Timer$1(::javax::swing::Timer *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Timer$1__
diff --git a/libjava/javax/swing/Timer$Task.h b/libjava/javax/swing/Timer$Task.h
deleted file mode 100644
index 94005aaccd9..00000000000
--- a/libjava/javax/swing/Timer$Task.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Timer$Task__
-#define __javax_swing_Timer$Task__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-        class Timer$Task;
-    }
-  }
-}
-
-class javax::swing::Timer$Task : public ::java::util::TimerTask
-{
-
-  Timer$Task(::javax::swing::Timer *);
-public:
-  virtual void run();
-public: // actually package-private
-  Timer$Task(::javax::swing::Timer *, ::javax::swing::Timer$Task *);
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Timer$Task__
diff --git a/libjava/javax/swing/Timer.h b/libjava/javax/swing/Timer.h
deleted file mode 100644
index 9768bdfb7a9..00000000000
--- a/libjava/javax/swing/Timer.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Timer__
-#define __javax_swing_Timer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-        class Timer$Task;
-      namespace event
-      {
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::Timer : public ::java::lang::Object
-{
-
-public:
-  Timer(jint, ::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual void setCoalesce(jboolean);
-  virtual jboolean isCoalesce();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  static void setLogTimers(jboolean);
-  static jboolean getLogTimers();
-  virtual void setDelay(jint);
-  virtual jint getDelay();
-  virtual void setInitialDelay(jint);
-  virtual jint getInitialDelay();
-  virtual void setRepeats(jboolean);
-  virtual jboolean isRepeats();
-  virtual jboolean isRunning();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual void restart();
-  virtual void start();
-  virtual void stop();
-public: // actually protected
-  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  virtual void fireActionPerformed();
-  virtual void drainEvents();
-  virtual void queueEvent();
-private:
-  static const jlong serialVersionUID = -1116180831621385484LL;
-  ::java::lang::Runnable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) drainer;
-  static ::java::util::Timer * timer;
-public: // actually package-private
-  static jboolean logTimers;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * listenerList;
-public: // actually package-private
-  jboolean coalesce;
-  jboolean repeats;
-  jint delay;
-  jint initialDelay;
-  jint ticks;
-  ::javax::swing::Timer$Task * task;
-private:
-  jlong queue;
-  ::java::lang::Object * queueLock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Timer__
diff --git a/libjava/javax/swing/ToolTipManager$insideTimerAction.h b/libjava/javax/swing/ToolTipManager$insideTimerAction.h
deleted file mode 100644
index 52fe573fe20..00000000000
--- a/libjava/javax/swing/ToolTipManager$insideTimerAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ToolTipManager$insideTimerAction__
-#define __javax_swing_ToolTipManager$insideTimerAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ToolTipManager;
-        class ToolTipManager$insideTimerAction;
-    }
-  }
-}
-
-class javax::swing::ToolTipManager$insideTimerAction : public ::java::lang::Object
-{
-
-public: // actually protected
-  ToolTipManager$insideTimerAction(::javax::swing::ToolTipManager *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ToolTipManager$insideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager$outsideTimerAction.h b/libjava/javax/swing/ToolTipManager$outsideTimerAction.h
deleted file mode 100644
index 1f418783b61..00000000000
--- a/libjava/javax/swing/ToolTipManager$outsideTimerAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ToolTipManager$outsideTimerAction__
-#define __javax_swing_ToolTipManager$outsideTimerAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ToolTipManager;
-        class ToolTipManager$outsideTimerAction;
-    }
-  }
-}
-
-class javax::swing::ToolTipManager$outsideTimerAction : public ::java::lang::Object
-{
-
-public: // actually protected
-  ToolTipManager$outsideTimerAction(::javax::swing::ToolTipManager *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ToolTipManager$outsideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h b/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h
deleted file mode 100644
index 2e334c56496..00000000000
--- a/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ToolTipManager$stillInsideTimerAction__
-#define __javax_swing_ToolTipManager$stillInsideTimerAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ToolTipManager;
-        class ToolTipManager$stillInsideTimerAction;
-    }
-  }
-}
-
-class javax::swing::ToolTipManager$stillInsideTimerAction : public ::java::lang::Object
-{
-
-public: // actually protected
-  ToolTipManager$stillInsideTimerAction(::javax::swing::ToolTipManager *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ToolTipManager$stillInsideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager.h b/libjava/javax/swing/ToolTipManager.h
deleted file mode 100644
index c838ac43daf..00000000000
--- a/libjava/javax/swing/ToolTipManager.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ToolTipManager__
-#define __javax_swing_ToolTipManager__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JToolTip;
-        class Popup;
-        class Timer;
-        class ToolTipManager;
-    }
-  }
-}
-
-class javax::swing::ToolTipManager : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  ToolTipManager();
-public:
-  static ::javax::swing::ToolTipManager * sharedInstance();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isEnabled();
-  virtual jboolean isLightWeightPopupEnabled();
-  virtual void setLightWeightPopupEnabled(jboolean);
-  virtual jint getInitialDelay();
-  virtual void setInitialDelay(jint);
-  virtual jint getDismissDelay();
-  virtual void setDismissDelay(jint);
-  virtual jint getReshowDelay();
-  virtual void setReshowDelay(jint);
-  virtual void registerComponent(::javax::swing::JComponent *);
-  virtual void unregisterComponent(::javax::swing::JComponent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-private:
-  void checkTipUpdate(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void showTip();
-private:
-  ::java::awt::Point * adjustLocation(::java::awt::Point *, ::java::awt::Component *, ::java::awt::Dimension *);
-public: // actually package-private
-  virtual void hideTip();
-private:
-  ::java::awt::Component * getContentPaneDeepestComponent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) enterTimer;
-  ::javax::swing::Timer * exitTimer;
-  ::javax::swing::Timer * insideTimer;
-private:
-  jboolean enabled;
-public: // actually protected
-  jboolean lightWeightPopupEnabled;
-  jboolean heavyWeightPopupEnabled;
-private:
-  static ::javax::swing::ToolTipManager * shared;
-  ::javax::swing::JComponent * currentComponent;
-  ::javax::swing::JToolTip * currentTip;
-  ::java::lang::String * toolTipText;
-  ::java::awt::Point * currentPoint;
-  ::javax::swing::Popup * popup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ToolTipManager__
diff --git a/libjava/javax/swing/TransferHandler$PropertyTransferable.h b/libjava/javax/swing/TransferHandler$PropertyTransferable.h
deleted file mode 100644
index 662bce0cac2..00000000000
--- a/libjava/javax/swing/TransferHandler$PropertyTransferable.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_TransferHandler$PropertyTransferable__
-#define __javax_swing_TransferHandler$PropertyTransferable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-    namespace beans
-    {
-        class PropertyDescriptor;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class TransferHandler$PropertyTransferable;
-    }
-  }
-}
-
-class javax::swing::TransferHandler$PropertyTransferable : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TransferHandler$PropertyTransferable(::javax::swing::JComponent *, ::java::beans::PropertyDescriptor *);
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
-private:
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
-  ::java::beans::PropertyDescriptor * property;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_TransferHandler$PropertyTransferable__
diff --git a/libjava/javax/swing/TransferHandler$SwingDragGestureRecognizer.h b/libjava/javax/swing/TransferHandler$SwingDragGestureRecognizer.h
deleted file mode 100644
index 03c7f18e833..00000000000
--- a/libjava/javax/swing/TransferHandler$SwingDragGestureRecognizer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_TransferHandler$SwingDragGestureRecognizer__
-#define __javax_swing_TransferHandler$SwingDragGestureRecognizer__
-
-#pragma interface
-
-#include <java/awt/dnd/DragGestureRecognizer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragGestureListener;
-      }
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class TransferHandler$SwingDragGestureRecognizer;
-    }
-  }
-}
-
-class javax::swing::TransferHandler$SwingDragGestureRecognizer : public ::java::awt::dnd::DragGestureRecognizer
-{
-
-public: // actually protected
-  TransferHandler$SwingDragGestureRecognizer(::java::awt::dnd::DragGestureListener *);
-public: // actually package-private
-  virtual void gesture(::javax::swing::JComponent *, ::java::awt::event::MouseEvent *, jint, jint);
-public: // actually protected
-  virtual void registerListeners();
-  virtual void unregisterListeners();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_TransferHandler$SwingDragGestureRecognizer__
diff --git a/libjava/javax/swing/TransferHandler$SwingDragHandler.h b/libjava/javax/swing/TransferHandler$SwingDragHandler.h
deleted file mode 100644
index 7b7631ca907..00000000000
--- a/libjava/javax/swing/TransferHandler$SwingDragHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_TransferHandler$SwingDragHandler__
-#define __javax_swing_TransferHandler$SwingDragHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragSourceDragEvent;
-          class DragSourceDropEvent;
-          class DragSourceEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class TransferHandler$SwingDragHandler;
-    }
-  }
-}
-
-class javax::swing::TransferHandler$SwingDragHandler : public ::java::lang::Object
-{
-
-  TransferHandler$SwingDragHandler();
-public:
-  virtual void dragGestureRecognized(::java::awt::dnd::DragGestureEvent *);
-  virtual void dragDropEnd(::java::awt::dnd::DragSourceDropEvent *);
-  virtual void dragEnter(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DragSourceEvent *);
-  virtual void dragOver(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DragSourceDragEvent *);
-public: // actually package-private
-  TransferHandler$SwingDragHandler(::javax::swing::TransferHandler$SwingDragHandler *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) autoscrolls;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_TransferHandler$SwingDragHandler__
diff --git a/libjava/javax/swing/TransferHandler$TransferAction.h b/libjava/javax/swing/TransferHandler$TransferAction.h
deleted file mode 100644
index f11d879681b..00000000000
--- a/libjava/javax/swing/TransferHandler$TransferAction.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_TransferHandler$TransferAction__
-#define __javax_swing_TransferHandler$TransferAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class TransferHandler$TransferAction;
-    }
-  }
-}
-
-class javax::swing::TransferHandler$TransferAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  TransferHandler$TransferAction(::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  static ::java::awt::datatransfer::Clipboard * getClipboard(::javax::swing::JComponent *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) command;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_TransferHandler$TransferAction__
diff --git a/libjava/javax/swing/TransferHandler.h b/libjava/javax/swing/TransferHandler.h
deleted file mode 100644
index f7ae8049286..00000000000
--- a/libjava/javax/swing/TransferHandler.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_TransferHandler__
-#define __javax_swing_TransferHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace event
-      {
-          class InputEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyDescriptor;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JComponent;
-        class TransferHandler;
-        class TransferHandler$SwingDragGestureRecognizer;
-    }
-  }
-}
-
-class javax::swing::TransferHandler : public ::java::lang::Object
-{
-
-public:
-  static ::javax::swing::Action * getCopyAction();
-  static ::javax::swing::Action * getCutAction();
-  static ::javax::swing::Action * getPasteAction();
-public: // actually protected
-  TransferHandler();
-public:
-  TransferHandler(::java::lang::String *);
-  virtual jboolean canImport(::javax::swing::JComponent *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
-public: // actually protected
-  virtual ::java::awt::datatransfer::Transferable * createTransferable(::javax::swing::JComponent *);
-public:
-  virtual void exportAsDrag(::javax::swing::JComponent *, ::java::awt::event::InputEvent *, jint);
-public: // actually protected
-  virtual void exportDone(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *, jint);
-public:
-  virtual void exportToClipboard(::javax::swing::JComponent *, ::java::awt::datatransfer::Clipboard *, jint);
-  virtual jint getSourceActions(::javax::swing::JComponent *);
-  virtual ::javax::swing::Icon * getVisualRepresentation(::java::awt::datatransfer::Transferable *);
-  virtual jboolean importData(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *);
-private:
-  ::java::beans::PropertyDescriptor * getPropertyDescriptor(::javax::swing::JComponent *);
-  ::java::awt::datatransfer::DataFlavor * getPropertyDataFlavor(::java::lang::Class *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
-  static const jlong serialVersionUID = -967749805571669910LL;
-  static ::java::lang::String * COMMAND_COPY;
-  static ::java::lang::String * COMMAND_CUT;
-  static ::java::lang::String * COMMAND_PASTE;
-public:
-  static const jint NONE = 0;
-  static const jint COPY = 1;
-  static const jint MOVE = 2;
-  static const jint COPY_OR_MOVE = 3;
-private:
-  static ::javax::swing::Action * copyAction;
-  static ::javax::swing::Action * cutAction;
-  static ::javax::swing::Action * pasteAction;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) sourceActions;
-  ::javax::swing::Icon * visualRepresentation;
-  ::java::lang::String * propertyName;
-  ::javax::swing::TransferHandler$SwingDragGestureRecognizer * recognizer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_TransferHandler__
diff --git a/libjava/javax/swing/UIDefaults$1.h b/libjava/javax/swing/UIDefaults$1.h
deleted file mode 100644
index 71fd942b6ec..00000000000
--- a/libjava/javax/swing/UIDefaults$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$1__
-#define __javax_swing_UIDefaults$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$1;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIDefaults$1(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::String * val$className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$1__
diff --git a/libjava/javax/swing/UIDefaults$2.h b/libjava/javax/swing/UIDefaults$2.h
deleted file mode 100644
index 4218f7a0e57..00000000000
--- a/libjava/javax/swing/UIDefaults$2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$2__
-#define __javax_swing_UIDefaults$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$2;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIDefaults$2(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::String * val$className;
-  ::java::lang::String * val$methodName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$2__
diff --git a/libjava/javax/swing/UIDefaults$3.h b/libjava/javax/swing/UIDefaults$3.h
deleted file mode 100644
index 55ba83032ce..00000000000
--- a/libjava/javax/swing/UIDefaults$3.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$3__
-#define __javax_swing_UIDefaults$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$3;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIDefaults$3(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::Object * > *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::String * val$className;
-  JArray< ::java::lang::Class * > * val$clss;
-  JArray< ::java::lang::Object * > * val$objs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$3__
diff --git a/libjava/javax/swing/UIDefaults$4.h b/libjava/javax/swing/UIDefaults$4.h
deleted file mode 100644
index 8f0ee748639..00000000000
--- a/libjava/javax/swing/UIDefaults$4.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$4__
-#define __javax_swing_UIDefaults$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$4;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIDefaults$4(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::Object * > *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::String * val$className;
-  ::java::lang::String * val$methodName;
-  JArray< ::java::lang::Class * > * val$clss;
-  JArray< ::java::lang::Object * > * val$objs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$4__
diff --git a/libjava/javax/swing/UIDefaults$ActiveValue.h b/libjava/javax/swing/UIDefaults$ActiveValue.h
deleted file mode 100644
index 37d1b403418..00000000000
--- a/libjava/javax/swing/UIDefaults$ActiveValue.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$ActiveValue__
-#define __javax_swing_UIDefaults$ActiveValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$ActiveValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$ActiveValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_UIDefaults$ActiveValue__
diff --git a/libjava/javax/swing/UIDefaults$LazyInputMap.h b/libjava/javax/swing/UIDefaults$LazyInputMap.h
deleted file mode 100644
index 1072c003043..00000000000
--- a/libjava/javax/swing/UIDefaults$LazyInputMap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$LazyInputMap__
-#define __javax_swing_UIDefaults$LazyInputMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$LazyInputMap;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$LazyInputMap : public ::java::lang::Object
-{
-
-public:
-  UIDefaults$LazyInputMap(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bind;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$LazyInputMap__
diff --git a/libjava/javax/swing/UIDefaults$LazyValue.h b/libjava/javax/swing/UIDefaults$LazyValue.h
deleted file mode 100644
index bd451e45b34..00000000000
--- a/libjava/javax/swing/UIDefaults$LazyValue.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$LazyValue__
-#define __javax_swing_UIDefaults$LazyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$LazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$LazyValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_UIDefaults$LazyValue__
diff --git a/libjava/javax/swing/UIDefaults$ProxyLazyValue.h b/libjava/javax/swing/UIDefaults$ProxyLazyValue.h
deleted file mode 100644
index ea6632c18ad..00000000000
--- a/libjava/javax/swing/UIDefaults$ProxyLazyValue.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$ProxyLazyValue__
-#define __javax_swing_UIDefaults$ProxyLazyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$LazyValue;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$ProxyLazyValue : public ::java::lang::Object
-{
-
-public:
-  UIDefaults$ProxyLazyValue(::java::lang::String *);
-  UIDefaults$ProxyLazyValue(::java::lang::String *, ::java::lang::String *);
-  UIDefaults$ProxyLazyValue(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  UIDefaults$ProxyLazyValue(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$LazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$ProxyLazyValue__
diff --git a/libjava/javax/swing/UIDefaults.h b/libjava/javax/swing/UIDefaults.h
deleted file mode 100644
index 2daecceee58..00000000000
--- a/libjava/javax/swing/UIDefaults.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults__
-#define __javax_swing_UIDefaults__
-
-#pragma interface
-
-#include <java/util/Hashtable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Font;
-        class Insets;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class UIDefaults;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-      }
-    }
-  }
-}
-
-class javax::swing::UIDefaults : public ::java::util::Hashtable
-{
-
-public:
-  UIDefaults();
-  UIDefaults(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putDefaults(JArray< ::java::lang::Object * > *);
-private:
-  ::java::lang::Object * checkAndPut(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual ::java::awt::Font * getFont(::java::lang::Object *);
-  virtual ::java::awt::Font * getFont(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::awt::Color * getColor(::java::lang::Object *);
-  virtual ::java::awt::Color * getColor(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::javax::swing::Icon * getIcon(::java::lang::Object *);
-  virtual ::javax::swing::Icon * getIcon(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::javax::swing::border::Border * getBorder(::java::lang::Object *);
-  virtual ::javax::swing::border::Border * getBorder(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::lang::String * getString(::java::lang::Object *);
-  virtual ::java::lang::String * getString(::java::lang::Object *, ::java::util::Locale *);
-  virtual jint getInt(::java::lang::Object *);
-  virtual jint getInt(::java::lang::Object *, ::java::util::Locale *);
-  virtual jboolean getBoolean(::java::lang::Object *);
-  virtual jboolean getBoolean(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::awt::Insets * getInsets(::java::lang::Object *);
-  virtual ::java::awt::Insets * getInsets(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::awt::Dimension * getDimension(::java::lang::Object *);
-  virtual ::java::awt::Dimension * getDimension(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::lang::Class * getUIClass(::java::lang::String *, ::java::lang::ClassLoader *);
-  virtual ::java::lang::Class * getUIClass(::java::lang::String *);
-public: // actually protected
-  virtual void getUIError(::java::lang::String *);
-public:
-  virtual ::javax::swing::plaf::ComponentUI * getUI(::javax::swing::JComponent *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void addResourceBundle(::java::lang::String *);
-  virtual void removeResourceBundle(::java::lang::String *);
-  virtual void setDefaultLocale(::java::util::Locale *);
-  virtual ::java::util::Locale * getDefaultLocale();
-private:
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::util::Hashtable)))) bundles;
-  ::java::util::Locale * defaultLocale;
-  ::java::beans::PropertyChangeSupport * propertyChangeSupport;
-  static const jlong serialVersionUID = 7341222528856548117LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults__
diff --git a/libjava/javax/swing/UIManager$LookAndFeelInfo.h b/libjava/javax/swing/UIManager$LookAndFeelInfo.h
deleted file mode 100644
index 581d76beef7..00000000000
--- a/libjava/javax/swing/UIManager$LookAndFeelInfo.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIManager$LookAndFeelInfo__
-#define __javax_swing_UIManager$LookAndFeelInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIManager$LookAndFeelInfo;
-    }
-  }
-}
-
-class javax::swing::UIManager$LookAndFeelInfo : public ::java::lang::Object
-{
-
-public:
-  UIManager$LookAndFeelInfo(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * clazz;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIManager$LookAndFeelInfo__
diff --git a/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h b/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h
deleted file mode 100644
index a256eaf3e70..00000000000
--- a/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
-#define __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIManager$MultiplexUIDefaults;
-        class UIManager$MultiplexUIDefaults$MultiplexEnumeration;
-    }
-  }
-}
-
-class javax::swing::UIManager$MultiplexUIDefaults$MultiplexEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIManager$MultiplexUIDefaults$MultiplexEnumeration(::javax::swing::UIManager$MultiplexUIDefaults *, ::java::util::Enumeration *, ::java::util::Enumeration *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  JArray< ::java::util::Enumeration * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enums;
-  jint i;
-  ::javax::swing::UIManager$MultiplexUIDefaults * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
diff --git a/libjava/javax/swing/UIManager$MultiplexUIDefaults.h b/libjava/javax/swing/UIManager$MultiplexUIDefaults.h
deleted file mode 100644
index 16a03c60dd2..00000000000
--- a/libjava/javax/swing/UIManager$MultiplexUIDefaults.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIManager$MultiplexUIDefaults__
-#define __javax_swing_UIManager$MultiplexUIDefaults__
-
-#pragma interface
-
-#include <javax/swing/UIDefaults.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIManager$MultiplexUIDefaults;
-    }
-  }
-}
-
-class javax::swing::UIManager$MultiplexUIDefaults : public ::javax::swing::UIDefaults
-{
-
-public: // actually package-private
-  UIManager$MultiplexUIDefaults(::javax::swing::UIDefaults *);
-public:
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::util::Enumeration * keys();
-  virtual ::java::util::Enumeration * elements();
-public: // actually package-private
-  ::javax::swing::UIDefaults * __attribute__((aligned(__alignof__( ::javax::swing::UIDefaults)))) fallback;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIManager$MultiplexUIDefaults__
diff --git a/libjava/javax/swing/UIManager.h b/libjava/javax/swing/UIManager.h
deleted file mode 100644
index c2cdf16cfed..00000000000
--- a/libjava/javax/swing/UIManager.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIManager__
-#define __javax_swing_UIManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Font;
-        class Insets;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class LookAndFeel;
-        class UIDefaults;
-        class UIManager;
-        class UIManager$LookAndFeelInfo;
-        class UIManager$MultiplexUIDefaults;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-      }
-    }
-  }
-}
-
-class javax::swing::UIManager : public ::java::lang::Object
-{
-
-public:
-  UIManager();
-  static void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  static void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  static JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  static void addAuxiliaryLookAndFeel(::javax::swing::LookAndFeel *);
-  static jboolean removeAuxiliaryLookAndFeel(::javax::swing::LookAndFeel *);
-  static JArray< ::javax::swing::LookAndFeel * > * getAuxiliaryLookAndFeels();
-  static ::java::lang::Object * get(::java::lang::Object *);
-  static ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
-  static jboolean getBoolean(::java::lang::Object *);
-  static jboolean getBoolean(::java::lang::Object *, ::java::util::Locale *);
-  static ::javax::swing::border::Border * getBorder(::java::lang::Object *);
-  static ::javax::swing::border::Border * getBorder(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::awt::Color * getColor(::java::lang::Object *);
-  static ::java::awt::Color * getColor(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::lang::String * getCrossPlatformLookAndFeelClassName();
-  static ::javax::swing::UIDefaults * getDefaults();
-  static ::java::awt::Dimension * getDimension(::java::lang::Object *);
-  static ::java::awt::Dimension * getDimension(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::awt::Font * getFont(::java::lang::Object *);
-  static ::java::awt::Font * getFont(::java::lang::Object *, ::java::util::Locale *);
-  static ::javax::swing::Icon * getIcon(::java::lang::Object *);
-  static ::javax::swing::Icon * getIcon(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::awt::Insets * getInsets(::java::lang::Object *);
-  static ::java::awt::Insets * getInsets(::java::lang::Object *, ::java::util::Locale *);
-  static JArray< ::javax::swing::UIManager$LookAndFeelInfo * > * getInstalledLookAndFeels();
-  static jint getInt(::java::lang::Object *);
-  static jint getInt(::java::lang::Object *, ::java::util::Locale *);
-  static ::javax::swing::LookAndFeel * getLookAndFeel();
-  static ::javax::swing::UIDefaults * getLookAndFeelDefaults();
-  static ::java::lang::String * getString(::java::lang::Object *);
-  static ::java::lang::String * getString(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::lang::String * getSystemLookAndFeelClassName();
-  static ::javax::swing::plaf::ComponentUI * getUI(::javax::swing::JComponent *);
-  static void installLookAndFeel(::java::lang::String *, ::java::lang::String *);
-  static void installLookAndFeel(::javax::swing::UIManager$LookAndFeelInfo *);
-  static ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  static void setInstalledLookAndFeels(JArray< ::javax::swing::UIManager$LookAndFeelInfo * > *);
-  static void setLookAndFeel(::javax::swing::LookAndFeel *);
-  static void setLookAndFeel(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5547433830339189365LL;
-public: // actually package-private
-  static JArray< ::javax::swing::UIManager$LookAndFeelInfo * > * installed;
-  static JArray< ::javax::swing::LookAndFeel * > * auxLookAndFeels;
-  static ::javax::swing::LookAndFeel * currentLookAndFeel;
-  static ::javax::swing::UIManager$MultiplexUIDefaults * currentUIDefaults;
-  static ::javax::swing::UIDefaults * lookAndFeelDefaults;
-  static ::java::beans::PropertyChangeSupport * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIManager__
diff --git a/libjava/javax/swing/UnsupportedLookAndFeelException.h b/libjava/javax/swing/UnsupportedLookAndFeelException.h
deleted file mode 100644
index bf5e35c1510..00000000000
--- a/libjava/javax/swing/UnsupportedLookAndFeelException.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UnsupportedLookAndFeelException__
-#define __javax_swing_UnsupportedLookAndFeelException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UnsupportedLookAndFeelException;
-    }
-  }
-}
-
-class javax::swing::UnsupportedLookAndFeelException : public ::java::lang::Exception
-{
-
-public:
-  UnsupportedLookAndFeelException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UnsupportedLookAndFeelException__
diff --git a/libjava/javax/swing/ViewportLayout.h b/libjava/javax/swing/ViewportLayout.h
deleted file mode 100644
index 9dadb49eafd..00000000000
--- a/libjava/javax/swing/ViewportLayout.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ViewportLayout__
-#define __javax_swing_ViewportLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ViewportLayout;
-    }
-  }
-}
-
-class javax::swing::ViewportLayout : public ::java::lang::Object
-{
-
-public:
-  ViewportLayout();
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-private:
-  static const jlong serialVersionUID = -788225906076097229LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ViewportLayout__
diff --git a/libjava/javax/swing/WindowConstants.h b/libjava/javax/swing/WindowConstants.h
deleted file mode 100644
index 8cad3c26829..00000000000
--- a/libjava/javax/swing/WindowConstants.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_WindowConstants__
-#define __javax_swing_WindowConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class WindowConstants;
-    }
-  }
-}
-
-class javax::swing::WindowConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint DO_NOTHING_ON_CLOSE = 0;
-  static const jint HIDE_ON_CLOSE = 1;
-  static const jint DISPOSE_ON_CLOSE = 2;
-  static const jint EXIT_ON_CLOSE = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_WindowConstants__
diff --git a/libjava/javax/swing/border/AbstractBorder.h b/libjava/javax/swing/border/AbstractBorder.h
deleted file mode 100644
index e91b5e98e87..00000000000
--- a/libjava/javax/swing/border/AbstractBorder.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_AbstractBorder__
-#define __javax_swing_border_AbstractBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class AbstractBorder;
-          class Border;
-      }
-    }
-  }
-}
-
-class javax::swing::border::AbstractBorder : public ::java::lang::Object
-{
-
-public:
-  AbstractBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual jboolean isBorderOpaque();
-  virtual ::java::awt::Rectangle * getInteriorRectangle(::java::awt::Component *, jint, jint, jint, jint);
-  static ::java::awt::Rectangle * getInteriorRectangle(::java::awt::Component *, ::javax::swing::border::Border *, jint, jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = -545885975315191844LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_AbstractBorder__
diff --git a/libjava/javax/swing/border/BevelBorder.h b/libjava/javax/swing/border/BevelBorder.h
deleted file mode 100644
index 369c1c57d1a..00000000000
--- a/libjava/javax/swing/border/BevelBorder.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_BevelBorder__
-#define __javax_swing_border_BevelBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class BevelBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::BevelBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BevelBorder(jint);
-  BevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  BevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Color * getHighlightOuterColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getHighlightInnerColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getShadowInnerColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getShadowOuterColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getHighlightOuterColor();
-  virtual ::java::awt::Color * getHighlightInnerColor();
-  virtual ::java::awt::Color * getShadowInnerColor();
-  virtual ::java::awt::Color * getShadowOuterColor();
-  virtual jint getBevelType();
-  virtual jboolean isBorderOpaque();
-public: // actually protected
-  virtual void paintRaisedBevel(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintLoweredBevel(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static void paintBevel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-public: // actually package-private
-  static const jlong serialVersionUID = -1034942243356299676LL;
-public:
-  static const jint RAISED = 0;
-  static const jint LOWERED = 1;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) bevelType;
-  ::java::awt::Color * highlightOuter;
-  ::java::awt::Color * highlightInner;
-  ::java::awt::Color * shadowOuter;
-  ::java::awt::Color * shadowInner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_BevelBorder__
diff --git a/libjava/javax/swing/border/Border.h b/libjava/javax/swing/border/Border.h
deleted file mode 100644
index 7fe11ee4640..00000000000
--- a/libjava/javax/swing/border/Border.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_Border__
-#define __javax_swing_border_Border__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-    }
-  }
-}
-
-class javax::swing::border::Border : public ::java::lang::Object
-{
-
-public:
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint) = 0;
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *) = 0;
-  virtual jboolean isBorderOpaque() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_border_Border__
diff --git a/libjava/javax/swing/border/CompoundBorder.h b/libjava/javax/swing/border/CompoundBorder.h
deleted file mode 100644
index 703398a730b..00000000000
--- a/libjava/javax/swing/border/CompoundBorder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_CompoundBorder__
-#define __javax_swing_border_CompoundBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-          class CompoundBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::CompoundBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  CompoundBorder();
-  CompoundBorder(::javax::swing::border::Border *, ::javax::swing::border::Border *);
-  virtual jboolean isBorderOpaque();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::javax::swing::border::Border * getOutsideBorder();
-  virtual ::javax::swing::border::Border * getInsideBorder();
-public: // actually package-private
-  static const jlong serialVersionUID = 9054540377030555103LL;
-public: // actually protected
-  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) insideBorder;
-  ::javax::swing::border::Border * outsideBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_CompoundBorder__
diff --git a/libjava/javax/swing/border/EmptyBorder.h b/libjava/javax/swing/border/EmptyBorder.h
deleted file mode 100644
index 8658371ad61..00000000000
--- a/libjava/javax/swing/border/EmptyBorder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_EmptyBorder__
-#define __javax_swing_border_EmptyBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class EmptyBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::EmptyBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  EmptyBorder(jint, jint, jint, jint);
-  EmptyBorder(::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Insets * getBorderInsets();
-  virtual jboolean isBorderOpaque();
-public: // actually package-private
-  static const jlong serialVersionUID = -8116076291731988694LL;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) left;
-  jint right;
-  jint top;
-  jint bottom;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_EmptyBorder__
diff --git a/libjava/javax/swing/border/EtchedBorder.h b/libjava/javax/swing/border/EtchedBorder.h
deleted file mode 100644
index f760547eb66..00000000000
--- a/libjava/javax/swing/border/EtchedBorder.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_EtchedBorder__
-#define __javax_swing_border_EtchedBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class EtchedBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::EtchedBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  EtchedBorder();
-  EtchedBorder(jint);
-  EtchedBorder(::java::awt::Color *, ::java::awt::Color *);
-  EtchedBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual jboolean isBorderOpaque();
-  virtual jint getEtchType();
-  virtual ::java::awt::Color * getHighlightColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getHighlightColor();
-  virtual ::java::awt::Color * getShadowColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getShadowColor();
-private:
-  static void paintEtchedBorder(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
-public: // actually package-private
-  static const jlong serialVersionUID = 4001244046866360638LL;
-public:
-  static const jint RAISED = 0;
-  static const jint LOWERED = 1;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) etchType;
-  ::java::awt::Color * highlight;
-  ::java::awt::Color * shadow;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_EtchedBorder__
diff --git a/libjava/javax/swing/border/LineBorder.h b/libjava/javax/swing/border/LineBorder.h
deleted file mode 100644
index dd8d05dc57e..00000000000
--- a/libjava/javax/swing/border/LineBorder.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_LineBorder__
-#define __javax_swing_border_LineBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-          class LineBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::LineBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  LineBorder(::java::awt::Color *);
-  LineBorder(::java::awt::Color *, jint);
-  LineBorder(::java::awt::Color *, jint, jboolean);
-  static ::javax::swing::border::Border * createBlackLineBorder();
-  static ::javax::swing::border::Border * createGrayLineBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Color * getLineColor();
-  virtual jint getThickness();
-  virtual jboolean getRoundedCorners();
-  virtual jboolean isBorderOpaque();
-public: // actually package-private
-  static const jlong serialVersionUID = -787563427772288970LL;
-private:
-  static ::javax::swing::border::LineBorder * blackLineBorder;
-  static ::javax::swing::border::LineBorder * grayLineBorder;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) thickness;
-  ::java::awt::Color * lineColor;
-  jboolean roundedCorners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_LineBorder__
diff --git a/libjava/javax/swing/border/MatteBorder.h b/libjava/javax/swing/border/MatteBorder.h
deleted file mode 100644
index 76dc3d981aa..00000000000
--- a/libjava/javax/swing/border/MatteBorder.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_MatteBorder__
-#define __javax_swing_border_MatteBorder__
-
-#pragma interface
-
-#include <javax/swing/border/EmptyBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace border
-      {
-          class MatteBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::MatteBorder : public ::javax::swing::border::EmptyBorder
-{
-
-public:
-  MatteBorder(jint, jint, jint, jint, ::java::awt::Color *);
-  MatteBorder(::java::awt::Insets *, ::java::awt::Color *);
-  MatteBorder(jint, jint, jint, jint, ::javax::swing::Icon *);
-  MatteBorder(::java::awt::Insets *, ::javax::swing::Icon *);
-  MatteBorder(::javax::swing::Icon *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Insets * getBorderInsets();
-  virtual ::java::awt::Color * getMatteColor();
-  virtual ::javax::swing::Icon * getTileIcon();
-  virtual jboolean isBorderOpaque();
-private:
-  void paintEdge(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 4422248989617298224LL;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::EmptyBorder)))) color;
-  ::javax::swing::Icon * tileIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_MatteBorder__
diff --git a/libjava/javax/swing/border/SoftBevelBorder.h b/libjava/javax/swing/border/SoftBevelBorder.h
deleted file mode 100644
index fa8ff5e6f51..00000000000
--- a/libjava/javax/swing/border/SoftBevelBorder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_SoftBevelBorder__
-#define __javax_swing_border_SoftBevelBorder__
-
-#pragma interface
-
-#include <javax/swing/border/BevelBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class SoftBevelBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::SoftBevelBorder : public ::javax::swing::border::BevelBorder
-{
-
-public:
-  SoftBevelBorder(jint);
-  SoftBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  SoftBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual jboolean isBorderOpaque();
-private:
-  static void paintSoftBevel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-public: // actually package-private
-  static const jlong serialVersionUID = 5248789787305979975LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_SoftBevelBorder__
diff --git a/libjava/javax/swing/border/TitledBorder.h b/libjava/javax/swing/border/TitledBorder.h
deleted file mode 100644
index 42d6b599dae..00000000000
--- a/libjava/javax/swing/border/TitledBorder.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_TitledBorder__
-#define __javax_swing_border_TitledBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Insets;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-          class TitledBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::TitledBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  TitledBorder(::java::lang::String *);
-  TitledBorder(::javax::swing::border::Border *);
-  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *);
-  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
-  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
-  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  void layoutBorderWithTitle(::java::awt::Component *, ::java::awt::FontMetrics *, ::java::awt::Rectangle *, ::java::awt::Point *);
-  void paintBorderWithTitle(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::FontMetrics *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual jboolean isBorderOpaque();
-  virtual ::java::lang::String * getTitle();
-  virtual ::javax::swing::border::Border * getBorder();
-  virtual jint getTitlePosition();
-  virtual jint getTitleJustification();
-  virtual ::java::awt::Font * getTitleFont();
-  virtual ::java::awt::Color * getTitleColor();
-  virtual void setTitle(::java::lang::String *);
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual void setTitlePosition(jint);
-  virtual void setTitleJustification(jint);
-  virtual void setTitleFont(::java::awt::Font *);
-  virtual void setTitleColor(::java::awt::Color *);
-  virtual ::java::awt::Dimension * getMinimumSize(::java::awt::Component *);
-public: // actually protected
-  virtual ::java::awt::Font * getFont(::java::awt::Component *);
-public:
-  static const jint DEFAULT_POSITION = 0;
-  static const jint ABOVE_TOP = 1;
-  static const jint TOP = 2;
-  static const jint BELOW_TOP = 3;
-  static const jint ABOVE_BOTTOM = 4;
-  static const jint BOTTOM = 5;
-  static const jint BELOW_BOTTOM = 6;
-  static const jint DEFAULT_JUSTIFICATION = 0;
-  static const jint LEFT = 1;
-  static const jint CENTER = 2;
-  static const jint RIGHT = 3;
-  static const jint LEADING = 4;
-  static const jint TRAILING = 5;
-public: // actually protected
-  static const jint EDGE_SPACING = 2;
-  static const jint TEXT_INSET_H = 5;
-  static const jint TEXT_SPACING = 2;
-public: // actually package-private
-  static const jlong serialVersionUID = 8012999415147721601LL;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) title;
-  ::javax::swing::border::Border * border;
-  jint titlePosition;
-  jint titleJustification;
-  ::java::awt::Font * titleFont;
-  ::java::awt::Color * titleColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_TitledBorder__
diff --git a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h b/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h
deleted file mode 100644
index 99a4e743fb4..00000000000
--- a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_AbstractColorChooserPanel__
-#define __javax_swing_colorchooser_AbstractColorChooserPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JColorChooser;
-      namespace colorchooser
-      {
-          class AbstractColorChooserPanel;
-          class ColorSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::AbstractColorChooserPanel : public ::javax::swing::JPanel
-{
-
-public:
-  AbstractColorChooserPanel();
-  virtual ::java::lang::String * getDisplayName() = 0;
-  virtual jint getMnemonic();
-  virtual jint getDisplayedMnemonicIndex();
-  virtual void updateChooser() = 0;
-public: // actually protected
-  virtual void buildChooser() = 0;
-public:
-  virtual ::javax::swing::Icon * getSmallDisplayIcon() = 0;
-  virtual ::javax::swing::Icon * getLargeDisplayIcon() = 0;
-  virtual void installChooserPanel(::javax::swing::JColorChooser *);
-  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
-  virtual ::javax::swing::colorchooser::ColorSelectionModel * getColorSelectionModel();
-public: // actually protected
-  virtual ::java::awt::Color * getColorFromModel();
-public:
-  virtual void paint(::java::awt::Graphics *);
-private:
-  static const jlong serialVersionUID = -977469671210173863LL;
-  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) chooser;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_AbstractColorChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h b/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h
deleted file mode 100644
index 495a5d14de2..00000000000
--- a/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_ColorChooserComponentFactory__
-#define __javax_swing_colorchooser_ColorChooserComponentFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace colorchooser
-      {
-          class AbstractColorChooserPanel;
-          class ColorChooserComponentFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::ColorChooserComponentFactory : public ::java::lang::Object
-{
-
-  ColorChooserComponentFactory();
-public:
-  static JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * getDefaultChooserPanels();
-  static ::javax::swing::JComponent * getPreviewPanel();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_ColorChooserComponentFactory__
diff --git a/libjava/javax/swing/colorchooser/ColorSelectionModel.h b/libjava/javax/swing/colorchooser/ColorSelectionModel.h
deleted file mode 100644
index 93bdab49304..00000000000
--- a/libjava/javax/swing/colorchooser/ColorSelectionModel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_ColorSelectionModel__
-#define __javax_swing_colorchooser_ColorSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class ColorSelectionModel;
-      }
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::ColorSelectionModel : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Color * getSelectedColor() = 0;
-  virtual void setSelectedColor(::java::awt::Color *) = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_colorchooser_ColorSelectionModel__
diff --git a/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h b/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h
deleted file mode 100644
index 52de9a3032c..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultColorSelectionModel__
-#define __javax_swing_colorchooser_DefaultColorSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultColorSelectionModel;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultColorSelectionModel : public ::java::lang::Object
-{
-
-public:
-  DefaultColorSelectionModel();
-  DefaultColorSelectionModel(::java::awt::Color *);
-  virtual ::java::awt::Color * getSelectedColor();
-  virtual void setSelectedColor(::java::awt::Color *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-private:
-  static const jlong serialVersionUID = -8117143602864778804LL;
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selectedColor;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultColorSelectionModel__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h
deleted file mode 100644
index 685ea893a72..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$1;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$1 : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$1(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h
deleted file mode 100644
index 200cee2a993..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$2;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$2 : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$2(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h
deleted file mode 100644
index fdac4c42fe3..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$ImageScrollListener;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$ImageScrollListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$ImageScrollListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h
deleted file mode 100644
index 009e2ec8442..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$MainGradientMouseListener;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$MainGradientMouseListener : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$MainGradientMouseListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-private:
-  void update(::java::awt::Point *);
-  void updateH(::java::awt::Point *);
-  void updateS(::java::awt::Point *);
-  void updateB(::java::awt::Point *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h
deleted file mode 100644
index 9384d465dad..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$RadioStateListener;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$RadioStateListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$RadioStateListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h
deleted file mode 100644
index 22bb90d55c2..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$SliderChangeListener;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$SliderChangeListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$SliderChangeListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h
deleted file mode 100644
index f6fc5d95017..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JColorChooser;
-        class JLabel;
-        class JPanel;
-        class JRadioButton;
-        class JSlider;
-        class JSpinner;
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel();
-public:
-  virtual ::java::lang::String * getDisplayName();
-  virtual void updateChooser();
-public: // actually protected
-  virtual void buildChooser();
-public:
-  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
-private:
-  ::java::awt::Container * buildRightPanel();
-public:
-  virtual ::javax::swing::Icon * getSmallDisplayIcon();
-  virtual ::javax::swing::Icon * getLargeDisplayIcon();
-  virtual void paint(::java::awt::Graphics *);
-private:
-  void updateHLockImage();
-  void updateBLockImage();
-  void updateSLockImage();
-public: // actually package-private
-  virtual void updateImage();
-private:
-  void updateTextFields();
-public: // actually package-private
-  virtual void updateSlider();
-  virtual void updateTrack();
-private:
-  void updateHTrack();
-  void updateSTrack();
-  void updateBTrack();
-  JArray< jfloat > * getHSBValues();
-public: // actually package-private
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) gradientImage;
-private:
-  ::javax::swing::JPanel * gradientPanel;
-public: // actually package-private
-  ::java::awt::Image * trackImage;
-private:
-  ::javax::swing::JPanel * trackPanel;
-public: // actually package-private
-  ::javax::swing::JSlider * slider;
-  ::javax::swing::JRadioButton * hRadio;
-  ::javax::swing::JRadioButton * sRadio;
-  ::javax::swing::JRadioButton * bRadio;
-  ::javax::swing::JSpinner * hSpinner;
-  ::javax::swing::JSpinner * sSpinner;
-  ::javax::swing::JSpinner * bSpinner;
-private:
-  static const jint imgWidth = 200;
-  static const jint imgHeight = 200;
-  static const jint trackWidth = 30;
-  static ::javax::swing::JLabel * R;
-  static ::javax::swing::JLabel * G;
-  static ::javax::swing::JLabel * B;
-  ::javax::swing::JLabel * rFull;
-  ::javax::swing::JLabel * gFull;
-  ::javax::swing::JLabel * bFull;
-public: // actually package-private
-  ::java::awt::Point * gradientPoint;
-  jboolean internalChange;
-  jboolean spinnerTrigger;
-  jint locked;
-  static const jint HLOCKED = 0;
-  static const jint SLOCKED = 1;
-  static const jint BLOCKED = 2;
-  jboolean handlingMouse;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h b/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h
deleted file mode 100644
index f6b0997923a..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
-#define __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultPreviewPanel;
-          class DefaultPreviewPanel$PreviewBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultPreviewPanel$PreviewBorder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultPreviewPanel$PreviewBorder(::javax::swing::colorchooser::DefaultPreviewPanel *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static const jint edge = 20;
-  static const jint lead = 5;
-  static const jint gap = 3;
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultPreviewPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
diff --git a/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h b/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h
deleted file mode 100644
index 7348bd53b47..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultPreviewPanel__
-#define __javax_swing_colorchooser_DefaultPreviewPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultPreviewPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultPreviewPanel : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  DefaultPreviewPanel();
-public:
-  virtual void paint(::java::awt::Graphics *);
-private:
-  void paintSquare(::java::awt::Graphics *, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, jint, jint, jint);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-private:
-  static jint largeGap;
-  static jint smallGap;
-  static jint squareSize;
-  static jint textPadding;
-  static jint rightSideRectWidth;
-  static ::java::lang::String * sample;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultPreviewPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h
deleted file mode 100644
index 1026b6d1a4a..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
-#define __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultRGBChooserPanel;
-          class DefaultRGBChooserPanel$SliderHandler;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultRGBChooserPanel$SliderHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultRGBChooserPanel$SliderHandler(::javax::swing::colorchooser::DefaultRGBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultRGBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h
deleted file mode 100644
index 85ba288ce81..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
-#define __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultRGBChooserPanel;
-          class DefaultRGBChooserPanel$SpinnerHandler;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultRGBChooserPanel$SpinnerHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultRGBChooserPanel$SpinnerHandler(::javax::swing::colorchooser::DefaultRGBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultRGBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h
deleted file mode 100644
index c9cc7afc372..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel__
-#define __javax_swing_colorchooser_DefaultRGBChooserPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JColorChooser;
-        class JLabel;
-        class JSlider;
-        class JSpinner;
-      namespace colorchooser
-      {
-          class DefaultRGBChooserPanel;
-      }
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultRGBChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
-{
-
-public:
-  DefaultRGBChooserPanel();
-  virtual ::java::lang::String * getDisplayName();
-  virtual void updateChooser();
-public: // actually protected
-  virtual void buildChooser();
-public:
-  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
-private:
-  void uninstallListeners();
-  void installListeners();
-public:
-  virtual ::javax::swing::Icon * getSmallDisplayIcon();
-  virtual ::javax::swing::Icon * getLargeDisplayIcon();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) spinnerChange;
-  jboolean sliderChange;
-  jboolean updateChange;
-private:
-  ::javax::swing::event::ChangeListener * colorChanger;
-  ::javax::swing::event::ChangeListener * spinnerHandler;
-public: // actually package-private
-  ::javax::swing::JSlider * R;
-  ::javax::swing::JSlider * G;
-  ::javax::swing::JSlider * B;
-private:
-  ::javax::swing::JLabel * RLabel;
-  ::javax::swing::JLabel * GLabel;
-  ::javax::swing::JLabel * BLabel;
-public: // actually package-private
-  ::javax::swing::JSpinner * RSpinner;
-  ::javax::swing::JSpinner * GSpinner;
-  ::javax::swing::JSpinner * BSpinner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h
deleted file mode 100644
index 41193308521..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$MainPanelLayout;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$MainPanelLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$MainPanelLayout();
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h
deleted file mode 100644
index 9a33fe149f3..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$MainSwatchPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$MainSwatchPanel : public ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$MainSwatchPanel();
-public:
-  virtual ::java::awt::Color * getColorForPosition(jint, jint);
-public: // actually protected
-  virtual void initializeColors();
-public:
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-  static ::java::awt::Color * C204255255;
-  static ::java::awt::Color * C255204204;
-  static ::java::awt::Color * C204255204;
-  static ::java::awt::Color * C204204204;
-  static ::java::awt::Color * C153153255;
-  static ::java::awt::Color * C051051255;
-  static ::java::awt::Color * C153000153;
-  static ::java::awt::Color * C000051051;
-  static ::java::awt::Color * C051000051;
-  static ::java::awt::Color * C051051000;
-  static ::java::awt::Color * C102102000;
-  static ::java::awt::Color * C153255153;
-  static ::java::awt::Color * C102255102;
-  static ::java::awt::Color * C000102102;
-  static ::java::awt::Color * C102000102;
-  static ::java::awt::Color * C000153153;
-  static ::java::awt::Color * C153153000;
-  static ::java::awt::Color * C204204000;
-  static ::java::awt::Color * C204000204;
-  static ::java::awt::Color * C000204204;
-  static ::java::awt::Color * C051255051;
-  static ::java::awt::Color * C255051051;
-  static ::java::awt::Color * C255102102;
-  static ::java::awt::Color * C102102255;
-  static ::java::awt::Color * C255153153;
-public: // actually package-private
-  static JArray< ::java::awt::Color * > * colors;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h
deleted file mode 100644
index b1de67fc4ff..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel;
-          class DefaultSwatchChooserPanel$MouseHandler;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$MouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$MouseHandler(::javax::swing::colorchooser::DefaultSwatchChooserPanel *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultSwatchChooserPanel * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h
deleted file mode 100644
index d4ce35b1808..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$RecentPanelLayout;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentPanelLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$RecentPanelLayout();
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h
deleted file mode 100644
index bbb78b807d9..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$RecentSwatchPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentSwatchPanel : public ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$RecentSwatchPanel();
-public:
-  virtual ::java::awt::Color * getColorForPosition(jint, jint);
-public: // actually protected
-  virtual void initializeColors();
-private:
-  jint getIndexForCell(jint, jint);
-public: // actually package-private
-  virtual void addColorToQueue(::java::awt::Color *);
-public:
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  JArray< ::java::awt::Color * > * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel)))) colors;
-public:
-  static ::java::awt::Color * defaultColor;
-public: // actually package-private
-  jint start;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h
deleted file mode 100644
index 39c05392648..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$SwatchPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$SwatchPanel();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Color * getColorForPosition(jint, jint) = 0;
-public: // actually protected
-  virtual void initializeColors() = 0;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) cellWidth;
-  jint cellHeight;
-  jint gap;
-  jint numRows;
-  jint numCols;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h
deleted file mode 100644
index 8db2fc6648c..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-      namespace event
-      {
-          class MouseEvent;
-          class MouseListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JColorChooser;
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel;
-          class DefaultSwatchChooserPanel$MainSwatchPanel;
-          class DefaultSwatchChooserPanel$RecentSwatchPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel();
-public:
-  virtual void updateChooser();
-public: // actually protected
-  virtual void buildChooser();
-public:
-  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
-  virtual ::java::lang::String * getDisplayName();
-  virtual ::javax::swing::Icon * getSmallDisplayIcon();
-  virtual ::javax::swing::Icon * getLargeDisplayIcon();
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultSwatchChooserPanel$MainSwatchPanel * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) mainPalette;
-  ::javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentSwatchPanel * recentPalette;
-  ::java::awt::event::MouseListener * mouseHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel__
diff --git a/libjava/javax/swing/event/AncestorEvent.h b/libjava/javax/swing/event/AncestorEvent.h
deleted file mode 100644
index 6966e58fc64..00000000000
--- a/libjava/javax/swing/event/AncestorEvent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_AncestorEvent__
-#define __javax_swing_event_AncestorEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace event
-      {
-          class AncestorEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::AncestorEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  AncestorEvent(::javax::swing::JComponent *, jint, ::java::awt::Container *, ::java::awt::Container *);
-  virtual ::java::awt::Container * getAncestor();
-  virtual ::java::awt::Container * getAncestorParent();
-  virtual ::javax::swing::JComponent * getComponent();
-private:
-  static const jlong serialVersionUID = -8079801679695605002LL;
-public:
-  static const jint ANCESTOR_ADDED = 1;
-  static const jint ANCESTOR_REMOVED = 2;
-  static const jint ANCESTOR_MOVED = 3;
-private:
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) sourceComponent;
-  ::java::awt::Container * ancestor;
-  ::java::awt::Container * ancestorParent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_AncestorEvent__
diff --git a/libjava/javax/swing/event/AncestorListener.h b/libjava/javax/swing/event/AncestorListener.h
deleted file mode 100644
index 2e2a162c03d..00000000000
--- a/libjava/javax/swing/event/AncestorListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_AncestorListener__
-#define __javax_swing_event_AncestorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class AncestorEvent;
-          class AncestorListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::AncestorListener : public ::java::lang::Object
-{
-
-public:
-  virtual void ancestorAdded(::javax::swing::event::AncestorEvent *) = 0;
-  virtual void ancestorRemoved(::javax::swing::event::AncestorEvent *) = 0;
-  virtual void ancestorMoved(::javax::swing::event::AncestorEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_AncestorListener__
diff --git a/libjava/javax/swing/event/CaretEvent.h b/libjava/javax/swing/event/CaretEvent.h
deleted file mode 100644
index 29f32e8d0dc..00000000000
--- a/libjava/javax/swing/event/CaretEvent.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_CaretEvent__
-#define __javax_swing_event_CaretEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class CaretEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::CaretEvent : public ::java::util::EventObject
-{
-
-public:
-  CaretEvent(::java::lang::Object *);
-  virtual jint getDot() = 0;
-  virtual jint getMark() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_CaretEvent__
diff --git a/libjava/javax/swing/event/CaretListener.h b/libjava/javax/swing/event/CaretListener.h
deleted file mode 100644
index 9169c866aea..00000000000
--- a/libjava/javax/swing/event/CaretListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_CaretListener__
-#define __javax_swing_event_CaretListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class CaretEvent;
-          class CaretListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::CaretListener : public ::java::lang::Object
-{
-
-public:
-  virtual void caretUpdate(::javax::swing::event::CaretEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_CaretListener__
diff --git a/libjava/javax/swing/event/CellEditorListener.h b/libjava/javax/swing/event/CellEditorListener.h
deleted file mode 100644
index 8f4bcfeb5d1..00000000000
--- a/libjava/javax/swing/event/CellEditorListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_CellEditorListener__
-#define __javax_swing_event_CellEditorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class CellEditorListener;
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::CellEditorListener : public ::java::lang::Object
-{
-
-public:
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *) = 0;
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_CellEditorListener__
diff --git a/libjava/javax/swing/event/ChangeEvent.h b/libjava/javax/swing/event/ChangeEvent.h
deleted file mode 100644
index afec4258b6a..00000000000
--- a/libjava/javax/swing/event/ChangeEvent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ChangeEvent__
-#define __javax_swing_event_ChangeEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ChangeEvent : public ::java::util::EventObject
-{
-
-public:
-  ChangeEvent(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_ChangeEvent__
diff --git a/libjava/javax/swing/event/ChangeListener.h b/libjava/javax/swing/event/ChangeListener.h
deleted file mode 100644
index fc80ec7fe6d..00000000000
--- a/libjava/javax/swing/event/ChangeListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ChangeListener__
-#define __javax_swing_event_ChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_ChangeListener__
diff --git a/libjava/javax/swing/event/DocumentEvent$ElementChange.h b/libjava/javax/swing/event/DocumentEvent$ElementChange.h
deleted file mode 100644
index c94fc69413c..00000000000
--- a/libjava/javax/swing/event/DocumentEvent$ElementChange.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_DocumentEvent$ElementChange__
-#define __javax_swing_event_DocumentEvent$ElementChange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::event::DocumentEvent$ElementChange : public ::java::lang::Object
-{
-
-public:
-  virtual jint getIndex() = 0;
-  virtual ::javax::swing::text::Element * getElement() = 0;
-  virtual JArray< ::javax::swing::text::Element * > * getChildrenRemoved() = 0;
-  virtual JArray< ::javax::swing::text::Element * > * getChildrenAdded() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_DocumentEvent$ElementChange__
diff --git a/libjava/javax/swing/event/DocumentEvent$EventType.h b/libjava/javax/swing/event/DocumentEvent$EventType.h
deleted file mode 100644
index b09a8e2bf3b..00000000000
--- a/libjava/javax/swing/event/DocumentEvent$EventType.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_DocumentEvent$EventType__
-#define __javax_swing_event_DocumentEvent$EventType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent$EventType;
-      }
-    }
-  }
-}
-
-class javax::swing::event::DocumentEvent$EventType : public ::java::lang::Object
-{
-
-  DocumentEvent$EventType(::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-  static ::javax::swing::event::DocumentEvent$EventType * INSERT;
-  static ::javax::swing::event::DocumentEvent$EventType * REMOVE;
-  static ::javax::swing::event::DocumentEvent$EventType * CHANGE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_DocumentEvent$EventType__
diff --git a/libjava/javax/swing/event/DocumentEvent.h b/libjava/javax/swing/event/DocumentEvent.h
deleted file mode 100644
index 7d6587d2fcc..00000000000
--- a/libjava/javax/swing/event/DocumentEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_DocumentEvent__
-#define __javax_swing_event_DocumentEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-          class DocumentEvent$EventType;
-      }
-      namespace text
-      {
-          class Document;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::event::DocumentEvent : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::event::DocumentEvent$EventType * getType() = 0;
-  virtual jint getOffset() = 0;
-  virtual jint getLength() = 0;
-  virtual ::javax::swing::text::Document * getDocument() = 0;
-  virtual ::javax::swing::event::DocumentEvent$ElementChange * getChange(::javax::swing::text::Element *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_DocumentEvent__
diff --git a/libjava/javax/swing/event/DocumentListener.h b/libjava/javax/swing/event/DocumentListener.h
deleted file mode 100644
index e836e5f3f23..00000000000
--- a/libjava/javax/swing/event/DocumentListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_DocumentListener__
-#define __javax_swing_event_DocumentListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::DocumentListener : public ::java::lang::Object
-{
-
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *) = 0;
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *) = 0;
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_DocumentListener__
diff --git a/libjava/javax/swing/event/EventListenerList.h b/libjava/javax/swing/event/EventListenerList.h
deleted file mode 100644
index 25209af6269..00000000000
--- a/libjava/javax/swing/event/EventListenerList.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_EventListenerList__
-#define __javax_swing_event_EventListenerList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::event::EventListenerList : public ::java::lang::Object
-{
-
-public:
-  EventListenerList();
-  virtual void add(::java::lang::Class *, ::java::util::EventListener *);
-  virtual jint getListenerCount();
-  virtual jint getListenerCount(::java::lang::Class *);
-  virtual JArray< ::java::lang::Object * > * getListenerList();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void remove(::java::lang::Class *, ::java::util::EventListener *);
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  static const jlong serialVersionUID = -5677132037850737084LL;
-private:
-  static JArray< ::java::lang::Object * > * NO_LISTENERS;
-public: // actually protected
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_EventListenerList__
diff --git a/libjava/javax/swing/event/HyperlinkEvent$EventType.h b/libjava/javax/swing/event/HyperlinkEvent$EventType.h
deleted file mode 100644
index 65bc22e17d4..00000000000
--- a/libjava/javax/swing/event/HyperlinkEvent$EventType.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_HyperlinkEvent$EventType__
-#define __javax_swing_event_HyperlinkEvent$EventType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent$EventType;
-      }
-    }
-  }
-}
-
-class javax::swing::event::HyperlinkEvent$EventType : public ::java::lang::Object
-{
-
-  HyperlinkEvent$EventType(::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-  static ::javax::swing::event::HyperlinkEvent$EventType * ENTERED;
-  static ::javax::swing::event::HyperlinkEvent$EventType * EXITED;
-  static ::javax::swing::event::HyperlinkEvent$EventType * ACTIVATED;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_HyperlinkEvent$EventType__
diff --git a/libjava/javax/swing/event/HyperlinkEvent.h b/libjava/javax/swing/event/HyperlinkEvent.h
deleted file mode 100644
index af86e8c1f28..00000000000
--- a/libjava/javax/swing/event/HyperlinkEvent.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_HyperlinkEvent__
-#define __javax_swing_event_HyperlinkEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent;
-          class HyperlinkEvent$EventType;
-      }
-      namespace text
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::event::HyperlinkEvent : public ::java::util::EventObject
-{
-
-public:
-  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *);
-  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *);
-  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::javax::swing::text::Element *);
-  virtual ::javax::swing::text::Element * getSourceElement();
-  virtual ::java::net::URL * getURL();
-  virtual ::javax::swing::event::HyperlinkEvent$EventType * getEventType();
-  virtual ::java::lang::String * getDescription();
-private:
-  static const jlong serialVersionUID = -2054640811732867012LL;
-  ::javax::swing::event::HyperlinkEvent$EventType * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) type;
-  ::java::net::URL * url;
-  ::java::lang::String * description;
-  ::javax::swing::text::Element * element;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_HyperlinkEvent__
diff --git a/libjava/javax/swing/event/HyperlinkListener.h b/libjava/javax/swing/event/HyperlinkListener.h
deleted file mode 100644
index ab76042e6b1..00000000000
--- a/libjava/javax/swing/event/HyperlinkListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_HyperlinkListener__
-#define __javax_swing_event_HyperlinkListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent;
-          class HyperlinkListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::HyperlinkListener : public ::java::lang::Object
-{
-
-public:
-  virtual void hyperlinkUpdate(::javax::swing::event::HyperlinkEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_HyperlinkListener__
diff --git a/libjava/javax/swing/event/InternalFrameAdapter.h b/libjava/javax/swing/event/InternalFrameAdapter.h
deleted file mode 100644
index 53aa9ba7a00..00000000000
--- a/libjava/javax/swing/event/InternalFrameAdapter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_InternalFrameAdapter__
-#define __javax_swing_event_InternalFrameAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class InternalFrameAdapter;
-          class InternalFrameEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::InternalFrameAdapter : public ::java::lang::Object
-{
-
-public:
-  InternalFrameAdapter();
-  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_InternalFrameAdapter__
diff --git a/libjava/javax/swing/event/InternalFrameEvent.h b/libjava/javax/swing/event/InternalFrameEvent.h
deleted file mode 100644
index e8ec9e17d0f..00000000000
--- a/libjava/javax/swing/event/InternalFrameEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_InternalFrameEvent__
-#define __javax_swing_event_InternalFrameEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JInternalFrame;
-      namespace event
-      {
-          class InternalFrameEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::InternalFrameEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  InternalFrameEvent(::javax::swing::JInternalFrame *, jint);
-  virtual ::javax::swing::JInternalFrame * getInternalFrame();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -5204823611874873183LL;
-public:
-  static const jint INTERNAL_FRAME_ACTIVATED = 25554;
-  static const jint INTERNAL_FRAME_CLOSED = 25551;
-  static const jint INTERNAL_FRAME_CLOSING = 25550;
-  static const jint INTERNAL_FRAME_DEACTIVATED = 25555;
-  static const jint INTERNAL_FRAME_DEICONIFIED = 25553;
-  static const jint INTERNAL_FRAME_FIRST = 25549;
-  static const jint INTERNAL_FRAME_ICONIFIED = 25552;
-  static const jint INTERNAL_FRAME_LAST = 25555;
-  static const jint INTERNAL_FRAME_OPENED = 25549;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_InternalFrameEvent__
diff --git a/libjava/javax/swing/event/InternalFrameListener.h b/libjava/javax/swing/event/InternalFrameListener.h
deleted file mode 100644
index 03f3e3b8c68..00000000000
--- a/libjava/javax/swing/event/InternalFrameListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_InternalFrameListener__
-#define __javax_swing_event_InternalFrameListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class InternalFrameEvent;
-          class InternalFrameListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::InternalFrameListener : public ::java::lang::Object
-{
-
-public:
-  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_InternalFrameListener__
diff --git a/libjava/javax/swing/event/ListDataEvent.h b/libjava/javax/swing/event/ListDataEvent.h
deleted file mode 100644
index 35920f22c78..00000000000
--- a/libjava/javax/swing/event/ListDataEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ListDataEvent__
-#define __javax_swing_event_ListDataEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ListDataEvent : public ::java::util::EventObject
-{
-
-public:
-  ListDataEvent(::java::lang::Object *, jint, jint, jint);
-  virtual jint getIndex0();
-  virtual jint getIndex1();
-  virtual jint getType();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 2510353260071004774LL;
-public:
-  static const jint CONTENTS_CHANGED = 0;
-  static const jint INTERVAL_ADDED = 1;
-  static const jint INTERVAL_REMOVED = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) type;
-  jint index0;
-  jint index1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_ListDataEvent__
diff --git a/libjava/javax/swing/event/ListDataListener.h b/libjava/javax/swing/event/ListDataListener.h
deleted file mode 100644
index b00dfb139f8..00000000000
--- a/libjava/javax/swing/event/ListDataListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ListDataListener__
-#define __javax_swing_event_ListDataListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ListDataListener : public ::java::lang::Object
-{
-
-public:
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *) = 0;
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *) = 0;
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_ListDataListener__
diff --git a/libjava/javax/swing/event/ListSelectionEvent.h b/libjava/javax/swing/event/ListSelectionEvent.h
deleted file mode 100644
index b981d49f2be..00000000000
--- a/libjava/javax/swing/event/ListSelectionEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ListSelectionEvent__
-#define __javax_swing_event_ListSelectionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ListSelectionEvent : public ::java::util::EventObject
-{
-
-public:
-  ListSelectionEvent(::java::lang::Object *, jint, jint, jboolean);
-  virtual jint getFirstIndex();
-  virtual jint getLastIndex();
-  virtual jboolean getValueIsAdjusting();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) firstIndex;
-  jint lastIndex;
-  jboolean isAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_ListSelectionEvent__
diff --git a/libjava/javax/swing/event/ListSelectionListener.h b/libjava/javax/swing/event/ListSelectionListener.h
deleted file mode 100644
index 252c9b5541d..00000000000
--- a/libjava/javax/swing/event/ListSelectionListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ListSelectionListener__
-#define __javax_swing_event_ListSelectionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-          class ListSelectionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ListSelectionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_ListSelectionListener__
diff --git a/libjava/javax/swing/event/MenuDragMouseEvent.h b/libjava/javax/swing/event/MenuDragMouseEvent.h
deleted file mode 100644
index aa19d3c3655..00000000000
--- a/libjava/javax/swing/event/MenuDragMouseEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuDragMouseEvent__
-#define __javax_swing_event_MenuDragMouseEvent__
-
-#pragma interface
-
-#include <java/awt/event/MouseEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class MenuDragMouseEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuDragMouseEvent : public ::java::awt::event::MouseEvent
-{
-
-public:
-  MenuDragMouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual JArray< ::javax::swing::MenuElement * > * getPath();
-  virtual ::javax::swing::MenuSelectionManager * getMenuSelectionManager();
-private:
-  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::awt::event::MouseEvent)))) path;
-  ::javax::swing::MenuSelectionManager * manager;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_MenuDragMouseEvent__
diff --git a/libjava/javax/swing/event/MenuDragMouseListener.h b/libjava/javax/swing/event/MenuDragMouseListener.h
deleted file mode 100644
index 760fe8448d3..00000000000
--- a/libjava/javax/swing/event/MenuDragMouseListener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuDragMouseListener__
-#define __javax_swing_event_MenuDragMouseListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuDragMouseEvent;
-          class MenuDragMouseListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuDragMouseListener : public ::java::lang::Object
-{
-
-public:
-  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *) = 0;
-  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *) = 0;
-  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *) = 0;
-  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_MenuDragMouseListener__
diff --git a/libjava/javax/swing/event/MenuEvent.h b/libjava/javax/swing/event/MenuEvent.h
deleted file mode 100644
index 988e7405979..00000000000
--- a/libjava/javax/swing/event/MenuEvent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuEvent__
-#define __javax_swing_event_MenuEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuEvent : public ::java::util::EventObject
-{
-
-public:
-  MenuEvent(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_MenuEvent__
diff --git a/libjava/javax/swing/event/MenuKeyEvent.h b/libjava/javax/swing/event/MenuKeyEvent.h
deleted file mode 100644
index ac61c98693e..00000000000
--- a/libjava/javax/swing/event/MenuKeyEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuKeyEvent__
-#define __javax_swing_event_MenuKeyEvent__
-
-#pragma interface
-
-#include <java/awt/event/KeyEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class MenuKeyEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuKeyEvent : public ::java::awt::event::KeyEvent
-{
-
-public:
-  MenuKeyEvent(::java::awt::Component *, jint, jlong, jint, jint, jchar, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual JArray< ::javax::swing::MenuElement * > * getPath();
-  virtual ::javax::swing::MenuSelectionManager * getMenuSelectionManager();
-private:
-  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::awt::event::KeyEvent)))) path;
-  ::javax::swing::MenuSelectionManager * manager;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_MenuKeyEvent__
diff --git a/libjava/javax/swing/event/MenuKeyListener.h b/libjava/javax/swing/event/MenuKeyListener.h
deleted file mode 100644
index cec8947cdd7..00000000000
--- a/libjava/javax/swing/event/MenuKeyListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuKeyListener__
-#define __javax_swing_event_MenuKeyListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuKeyEvent;
-          class MenuKeyListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuKeyListener : public ::java::lang::Object
-{
-
-public:
-  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *) = 0;
-  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *) = 0;
-  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_MenuKeyListener__
diff --git a/libjava/javax/swing/event/MenuListener.h b/libjava/javax/swing/event/MenuListener.h
deleted file mode 100644
index 356a633bcb8..00000000000
--- a/libjava/javax/swing/event/MenuListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuListener__
-#define __javax_swing_event_MenuListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuEvent;
-          class MenuListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuListener : public ::java::lang::Object
-{
-
-public:
-  virtual void menuCanceled(::javax::swing::event::MenuEvent *) = 0;
-  virtual void menuDeselected(::javax::swing::event::MenuEvent *) = 0;
-  virtual void menuSelected(::javax::swing::event::MenuEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_MenuListener__
diff --git a/libjava/javax/swing/event/MouseInputAdapter.h b/libjava/javax/swing/event/MouseInputAdapter.h
deleted file mode 100644
index 05e75898539..00000000000
--- a/libjava/javax/swing/event/MouseInputAdapter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MouseInputAdapter__
-#define __javax_swing_event_MouseInputAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MouseInputAdapter;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MouseInputAdapter : public ::java::lang::Object
-{
-
-public:
-  MouseInputAdapter();
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_MouseInputAdapter__
diff --git a/libjava/javax/swing/event/MouseInputListener.h b/libjava/javax/swing/event/MouseInputListener.h
deleted file mode 100644
index 10deab46527..00000000000
--- a/libjava/javax/swing/event/MouseInputListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MouseInputListener__
-#define __javax_swing_event_MouseInputListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MouseInputListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MouseInputListener : public ::java::lang::Object
-{
-
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *) = 0;
-  virtual void mousePressed(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseReleased(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseEntered(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseExited(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseDragged(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseMoved(::java::awt::event::MouseEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_MouseInputListener__
diff --git a/libjava/javax/swing/event/PopupMenuEvent.h b/libjava/javax/swing/event/PopupMenuEvent.h
deleted file mode 100644
index 4292f10c652..00000000000
--- a/libjava/javax/swing/event/PopupMenuEvent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_PopupMenuEvent__
-#define __javax_swing_event_PopupMenuEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class PopupMenuEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::PopupMenuEvent : public ::java::util::EventObject
-{
-
-public:
-  PopupMenuEvent(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_PopupMenuEvent__
diff --git a/libjava/javax/swing/event/PopupMenuListener.h b/libjava/javax/swing/event/PopupMenuListener.h
deleted file mode 100644
index 8446bc3a254..00000000000
--- a/libjava/javax/swing/event/PopupMenuListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_PopupMenuListener__
-#define __javax_swing_event_PopupMenuListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class PopupMenuEvent;
-          class PopupMenuListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::PopupMenuListener : public ::java::lang::Object
-{
-
-public:
-  virtual void popupMenuCanceled(::javax::swing::event::PopupMenuEvent *) = 0;
-  virtual void popupMenuWillBecomeInvisible(::javax::swing::event::PopupMenuEvent *) = 0;
-  virtual void popupMenuWillBecomeVisible(::javax::swing::event::PopupMenuEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_PopupMenuListener__
diff --git a/libjava/javax/swing/event/SwingPropertyChangeSupport.h b/libjava/javax/swing/event/SwingPropertyChangeSupport.h
deleted file mode 100644
index 7d997085c0f..00000000000
--- a/libjava/javax/swing/event/SwingPropertyChangeSupport.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_SwingPropertyChangeSupport__
-#define __javax_swing_event_SwingPropertyChangeSupport__
-
-#pragma interface
-
-#include <java/beans/PropertyChangeSupport.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class SwingPropertyChangeSupport;
-      }
-    }
-  }
-}
-
-class javax::swing::event::SwingPropertyChangeSupport : public ::java::beans::PropertyChangeSupport
-{
-
-public:
-  SwingPropertyChangeSupport(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 7162625831330845068LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_SwingPropertyChangeSupport__
diff --git a/libjava/javax/swing/event/TableColumnModelEvent.h b/libjava/javax/swing/event/TableColumnModelEvent.h
deleted file mode 100644
index 0de5a8f5138..00000000000
--- a/libjava/javax/swing/event/TableColumnModelEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TableColumnModelEvent__
-#define __javax_swing_event_TableColumnModelEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableColumnModelEvent;
-      }
-      namespace table
-      {
-          class TableColumnModel;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TableColumnModelEvent : public ::java::util::EventObject
-{
-
-public:
-  TableColumnModelEvent(::javax::swing::table::TableColumnModel *, jint, jint);
-  virtual jint getFromIndex();
-  virtual jint getToIndex();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) fromIndex;
-  jint toIndex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TableColumnModelEvent__
diff --git a/libjava/javax/swing/event/TableColumnModelListener.h b/libjava/javax/swing/event/TableColumnModelListener.h
deleted file mode 100644
index 3712b2e27e8..00000000000
--- a/libjava/javax/swing/event/TableColumnModelListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TableColumnModelListener__
-#define __javax_swing_event_TableColumnModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-          class TableColumnModelListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TableColumnModelListener : public ::java::lang::Object
-{
-
-public:
-  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *) = 0;
-  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *) = 0;
-  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *) = 0;
-  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *) = 0;
-  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TableColumnModelListener__
diff --git a/libjava/javax/swing/event/TableModelEvent.h b/libjava/javax/swing/event/TableModelEvent.h
deleted file mode 100644
index dff48f5eb68..00000000000
--- a/libjava/javax/swing/event/TableModelEvent.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TableModelEvent__
-#define __javax_swing_event_TableModelEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableModelEvent;
-      }
-      namespace table
-      {
-          class TableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TableModelEvent : public ::java::util::EventObject
-{
-
-public:
-  TableModelEvent(::javax::swing::table::TableModel *);
-  TableModelEvent(::javax::swing::table::TableModel *, jint);
-  TableModelEvent(::javax::swing::table::TableModel *, jint, jint);
-  TableModelEvent(::javax::swing::table::TableModel *, jint, jint, jint);
-  TableModelEvent(::javax::swing::table::TableModel *, jint, jint, jint, jint);
-  virtual jint getColumn();
-  virtual jint getFirstRow();
-  virtual jint getLastRow();
-  virtual jint getType();
-private:
-  static const jlong serialVersionUID = -7849342674552212824LL;
-public:
-  static const jint ALL_COLUMNS = -1;
-  static const jint DELETE = -1;
-  static const jint HEADER_ROW = -1;
-  static const jint INSERT = 1;
-  static const jint UPDATE = 0;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) column;
-  jint firstRow;
-  jint lastRow;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TableModelEvent__
diff --git a/libjava/javax/swing/event/TableModelListener.h b/libjava/javax/swing/event/TableModelListener.h
deleted file mode 100644
index db47af49fdb..00000000000
--- a/libjava/javax/swing/event/TableModelListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TableModelListener__
-#define __javax_swing_event_TableModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableModelEvent;
-          class TableModelListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TableModelListener : public ::java::lang::Object
-{
-
-public:
-  virtual void tableChanged(::javax::swing::event::TableModelEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TableModelListener__
diff --git a/libjava/javax/swing/event/TreeExpansionEvent.h b/libjava/javax/swing/event/TreeExpansionEvent.h
deleted file mode 100644
index 8694a2b3307..00000000000
--- a/libjava/javax/swing/event/TreeExpansionEvent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeExpansionEvent__
-#define __javax_swing_event_TreeExpansionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeExpansionEvent : public ::java::util::EventObject
-{
-
-public:
-  TreeExpansionEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPath();
-public: // actually protected
-  ::javax::swing::tree::TreePath * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) path;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TreeExpansionEvent__
diff --git a/libjava/javax/swing/event/TreeExpansionListener.h b/libjava/javax/swing/event/TreeExpansionListener.h
deleted file mode 100644
index 86960dbccaf..00000000000
--- a/libjava/javax/swing/event/TreeExpansionListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeExpansionListener__
-#define __javax_swing_event_TreeExpansionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-          class TreeExpansionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeExpansionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *) = 0;
-  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TreeExpansionListener__
diff --git a/libjava/javax/swing/event/TreeModelEvent.h b/libjava/javax/swing/event/TreeModelEvent.h
deleted file mode 100644
index 857ebf532bd..00000000000
--- a/libjava/javax/swing/event/TreeModelEvent.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeModelEvent__
-#define __javax_swing_event_TreeModelEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeModelEvent : public ::java::util::EventObject
-{
-
-public:
-  TreeModelEvent(::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  TreeModelEvent(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  TreeModelEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *);
-  TreeModelEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual JArray< jint > * getChildIndices();
-  virtual JArray< ::java::lang::Object * > * getChildren();
-  virtual JArray< ::java::lang::Object * > * getPath();
-  virtual ::javax::swing::tree::TreePath * getTreePath();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) childIndices;
-  JArray< ::java::lang::Object * > * children;
-  ::javax::swing::tree::TreePath * path;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TreeModelEvent__
diff --git a/libjava/javax/swing/event/TreeModelListener.h b/libjava/javax/swing/event/TreeModelListener.h
deleted file mode 100644
index cde0849debe..00000000000
--- a/libjava/javax/swing/event/TreeModelListener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeModelListener__
-#define __javax_swing_event_TreeModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-          class TreeModelListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeModelListener : public ::java::lang::Object
-{
-
-public:
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TreeModelListener__
diff --git a/libjava/javax/swing/event/TreeSelectionEvent.h b/libjava/javax/swing/event/TreeSelectionEvent.h
deleted file mode 100644
index 82bdfd61db5..00000000000
--- a/libjava/javax/swing/event/TreeSelectionEvent.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeSelectionEvent__
-#define __javax_swing_event_TreeSelectionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeSelectionEvent;
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeSelectionEvent : public ::java::util::EventObject
-{
-
-public:
-  TreeSelectionEvent(::java::lang::Object *, JArray< ::javax::swing::tree::TreePath * > *, JArray< jboolean > *, ::javax::swing::tree::TreePath *, ::javax::swing::tree::TreePath *);
-  TreeSelectionEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *, jboolean, ::javax::swing::tree::TreePath *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPath();
-  virtual JArray< ::javax::swing::tree::TreePath * > * getPaths();
-  virtual jboolean isAddedPath();
-  virtual jboolean isAddedPath(::javax::swing::tree::TreePath *);
-  virtual jboolean isAddedPath(jint);
-  virtual ::javax::swing::tree::TreePath * getOldLeadSelectionPath();
-  virtual ::javax::swing::tree::TreePath * getNewLeadSelectionPath();
-  virtual ::java::lang::Object * cloneWithSource(::java::lang::Object *);
-public: // actually protected
-  JArray< ::javax::swing::tree::TreePath * > * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) paths;
-  JArray< jboolean > * areNew;
-  ::javax::swing::tree::TreePath * oldLeadSelectionPath;
-  ::javax::swing::tree::TreePath * newLeadSelectionPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TreeSelectionEvent__
diff --git a/libjava/javax/swing/event/TreeSelectionListener.h b/libjava/javax/swing/event/TreeSelectionListener.h
deleted file mode 100644
index 121f05f8892..00000000000
--- a/libjava/javax/swing/event/TreeSelectionListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeSelectionListener__
-#define __javax_swing_event_TreeSelectionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeSelectionEvent;
-          class TreeSelectionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeSelectionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TreeSelectionListener__
diff --git a/libjava/javax/swing/event/TreeWillExpandListener.h b/libjava/javax/swing/event/TreeWillExpandListener.h
deleted file mode 100644
index fea233e55c8..00000000000
--- a/libjava/javax/swing/event/TreeWillExpandListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeWillExpandListener__
-#define __javax_swing_event_TreeWillExpandListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-          class TreeWillExpandListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeWillExpandListener : public ::java::lang::Object
-{
-
-public:
-  virtual void treeWillCollapse(::javax::swing::event::TreeExpansionEvent *) = 0;
-  virtual void treeWillExpand(::javax::swing::event::TreeExpansionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TreeWillExpandListener__
diff --git a/libjava/javax/swing/event/UndoableEditEvent.h b/libjava/javax/swing/event/UndoableEditEvent.h
deleted file mode 100644
index 244795301ec..00000000000
--- a/libjava/javax/swing/event/UndoableEditEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_UndoableEditEvent__
-#define __javax_swing_event_UndoableEditEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class UndoableEditEvent;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::event::UndoableEditEvent : public ::java::util::EventObject
-{
-
-public:
-  UndoableEditEvent(::java::lang::Object *, ::javax::swing::undo::UndoableEdit *);
-  virtual ::javax::swing::undo::UndoableEdit * getEdit();
-private:
-  static const jlong serialVersionUID = 4418044561759134484LL;
-  ::javax::swing::undo::UndoableEdit * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) edit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_UndoableEditEvent__
diff --git a/libjava/javax/swing/event/UndoableEditListener.h b/libjava/javax/swing/event/UndoableEditListener.h
deleted file mode 100644
index 738c5329a7f..00000000000
--- a/libjava/javax/swing/event/UndoableEditListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_UndoableEditListener__
-#define __javax_swing_event_UndoableEditListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class UndoableEditEvent;
-          class UndoableEditListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::UndoableEditListener : public ::java::lang::Object
-{
-
-public:
-  virtual void undoableEditHappened(::javax::swing::event::UndoableEditEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_UndoableEditListener__
diff --git a/libjava/javax/swing/filechooser/FileFilter.h b/libjava/javax/swing/filechooser/FileFilter.h
deleted file mode 100644
index ce2d75e746e..00000000000
--- a/libjava/javax/swing/filechooser/FileFilter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_filechooser_FileFilter__
-#define __javax_swing_filechooser_FileFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace filechooser
-      {
-          class FileFilter;
-      }
-    }
-  }
-}
-
-class javax::swing::filechooser::FileFilter : public ::java::lang::Object
-{
-
-public:
-  FileFilter();
-  virtual jboolean accept(::java::io::File *) = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_filechooser_FileFilter__
diff --git a/libjava/javax/swing/filechooser/FileSystemView.h b/libjava/javax/swing/filechooser/FileSystemView.h
deleted file mode 100644
index 48b35954c40..00000000000
--- a/libjava/javax/swing/filechooser/FileSystemView.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_filechooser_FileSystemView__
-#define __javax_swing_filechooser_FileSystemView__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace filechooser
-      {
-          class FileSystemView;
-      }
-    }
-  }
-}
-
-class javax::swing::filechooser::FileSystemView : public ::java::lang::Object
-{
-
-public:
-  FileSystemView();
-  virtual ::java::io::File * createFileObject(::java::io::File *, ::java::lang::String *);
-  virtual ::java::io::File * createFileObject(::java::lang::String *);
-public: // actually protected
-  virtual ::java::io::File * createFileSystemRoot(::java::io::File *);
-public:
-  virtual ::java::io::File * createNewFolder(::java::io::File *) = 0;
-  virtual ::java::io::File * getChild(::java::io::File *, ::java::lang::String *);
-  virtual ::java::io::File * getDefaultDirectory();
-  virtual JArray< ::java::io::File * > * getFiles(::java::io::File *, jboolean);
-  static ::javax::swing::filechooser::FileSystemView * getFileSystemView();
-  virtual ::java::io::File * getHomeDirectory();
-  virtual ::java::io::File * getParentDirectory(::java::io::File *);
-  virtual JArray< ::java::io::File * > * getRoots();
-  virtual ::java::lang::String * getSystemDisplayName(::java::io::File *);
-  virtual ::javax::swing::Icon * getSystemIcon(::java::io::File *);
-  virtual ::java::lang::String * getSystemTypeDescription(::java::io::File *);
-  virtual jboolean isComputerNode(::java::io::File *);
-  virtual jboolean isDrive(::java::io::File *);
-  virtual jboolean isFileSystem(::java::io::File *);
-  virtual jboolean isFileSystemRoot(::java::io::File *);
-  virtual jboolean isFloppyDrive(::java::io::File *);
-  virtual jboolean isHiddenFile(::java::io::File *);
-  virtual jboolean isParent(::java::io::File *, ::java::io::File *);
-  virtual jboolean isRoot(::java::io::File *);
-  virtual ::java::lang::Boolean * isTraversable(::java::io::File *);
-private:
-  static ::javax::swing::filechooser::FileSystemView * defaultFileSystemView;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_filechooser_FileSystemView__
diff --git a/libjava/javax/swing/filechooser/FileView.h b/libjava/javax/swing/filechooser/FileView.h
deleted file mode 100644
index dffaa0f2bdb..00000000000
--- a/libjava/javax/swing/filechooser/FileView.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_filechooser_FileView__
-#define __javax_swing_filechooser_FileView__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace filechooser
-      {
-          class FileView;
-      }
-    }
-  }
-}
-
-class javax::swing::filechooser::FileView : public ::java::lang::Object
-{
-
-public:
-  FileView();
-  virtual ::java::lang::String * getName(::java::io::File *);
-  virtual ::java::lang::String * getDescription(::java::io::File *);
-  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
-  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
-  virtual ::java::lang::Boolean * isTraversable(::java::io::File *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_filechooser_FileView__
diff --git a/libjava/javax/swing/filechooser/UnixFileSystemView.h b/libjava/javax/swing/filechooser/UnixFileSystemView.h
deleted file mode 100644
index e06f9b8f0d0..00000000000
--- a/libjava/javax/swing/filechooser/UnixFileSystemView.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_filechooser_UnixFileSystemView__
-#define __javax_swing_filechooser_UnixFileSystemView__
-
-#pragma interface
-
-#include <javax/swing/filechooser/FileSystemView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace filechooser
-      {
-          class UnixFileSystemView;
-      }
-    }
-  }
-}
-
-class javax::swing::filechooser::UnixFileSystemView : public ::javax::swing::filechooser::FileSystemView
-{
-
-public: // actually package-private
-  UnixFileSystemView();
-public:
-  virtual ::java::io::File * createNewFolder(::java::io::File *);
-  virtual JArray< ::java::io::File * > * getRoots();
-  virtual ::java::lang::String * getSystemDisplayName(::java::io::File *);
-  virtual ::javax::swing::Icon * getSystemIcon(::java::io::File *);
-  virtual ::java::lang::String * getSystemTypeDescription(::java::io::File *);
-  virtual jboolean isRoot(::java::io::File *);
-private:
-  static ::java::lang::String * NEW_FOLDER_NAME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_filechooser_UnixFileSystemView__
diff --git a/libjava/javax/swing/plaf/ActionMapUIResource.h b/libjava/javax/swing/plaf/ActionMapUIResource.h
deleted file mode 100644
index a9364d8e2d2..00000000000
--- a/libjava/javax/swing/plaf/ActionMapUIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ActionMapUIResource__
-#define __javax_swing_plaf_ActionMapUIResource__
-
-#pragma interface
-
-#include <javax/swing/ActionMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ActionMapUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ActionMapUIResource : public ::javax::swing::ActionMap
-{
-
-public:
-  ActionMapUIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ActionMapUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h
deleted file mode 100644
index c85a1ba6ebf..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/BevelBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class BorderUIResource$BevelBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$BevelBorderUIResource : public ::javax::swing::border::BevelBorder
-{
-
-public:
-  BorderUIResource$BevelBorderUIResource(jint);
-  BorderUIResource$BevelBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *);
-  BorderUIResource$BevelBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-private:
-  static const jlong serialVersionUID = -1275542891108351642LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h
deleted file mode 100644
index 8161ecbe9fd..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/CompoundBorder.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class BorderUIResource$CompoundBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$CompoundBorderUIResource : public ::javax::swing::border::CompoundBorder
-{
-
-public:
-  BorderUIResource$CompoundBorderUIResource(::javax::swing::border::Border *, ::javax::swing::border::Border *);
-private:
-  static const jlong serialVersionUID = 7550017084975167341LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h
deleted file mode 100644
index 15ba53faecd..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/EmptyBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class BorderUIResource$EmptyBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$EmptyBorderUIResource : public ::javax::swing::border::EmptyBorder
-{
-
-public:
-  BorderUIResource$EmptyBorderUIResource(jint, jint, jint, jint);
-  BorderUIResource$EmptyBorderUIResource(::java::awt::Insets *);
-private:
-  static const jlong serialVersionUID = -4914187529340071708LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h
deleted file mode 100644
index 89934717a2d..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/EtchedBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class BorderUIResource$EtchedBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$EtchedBorderUIResource : public ::javax::swing::border::EtchedBorder
-{
-
-public:
-  BorderUIResource$EtchedBorderUIResource();
-  BorderUIResource$EtchedBorderUIResource(jint);
-  BorderUIResource$EtchedBorderUIResource(::java::awt::Color *, ::java::awt::Color *);
-  BorderUIResource$EtchedBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *);
-private:
-  static const jlong serialVersionUID = -8186391754165296656LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h
deleted file mode 100644
index fe3669c0014..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/LineBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class BorderUIResource$LineBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$LineBorderUIResource : public ::javax::swing::border::LineBorder
-{
-
-public:
-  BorderUIResource$LineBorderUIResource(::java::awt::Color *);
-  BorderUIResource$LineBorderUIResource(::java::awt::Color *, jint);
-private:
-  static const jlong serialVersionUID = -6171232338180172310LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h
deleted file mode 100644
index b5925fce775..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/MatteBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-          class BorderUIResource$MatteBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$MatteBorderUIResource : public ::javax::swing::border::MatteBorder
-{
-
-public:
-  BorderUIResource$MatteBorderUIResource(jint, jint, jint, jint, ::java::awt::Color *);
-  BorderUIResource$MatteBorderUIResource(jint, jint, jint, jint, ::javax::swing::Icon *);
-  BorderUIResource$MatteBorderUIResource(::javax::swing::Icon *);
-private:
-  static const jlong serialVersionUID = -8107923147541851122LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h
deleted file mode 100644
index a20193f6d01..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/TitledBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class BorderUIResource$TitledBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$TitledBorderUIResource : public ::javax::swing::border::TitledBorder
-{
-
-public:
-  BorderUIResource$TitledBorderUIResource(::java::lang::String *);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
-private:
-  static const jlong serialVersionUID = 7667113547406407427LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource.h
deleted file mode 100644
index 3a89c2c00c5..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource__
-#define __javax_swing_plaf_BorderUIResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class BorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource : public ::java::lang::Object
-{
-
-public:
-  static ::javax::swing::border::Border * getEtchedBorderUIResource();
-  static ::javax::swing::border::Border * getLoweredBevelBorderUIResource();
-  static ::javax::swing::border::Border * getRaisedBevelBorderUIResource();
-  static ::javax::swing::border::Border * getBlackLineBorderUIResource();
-  BorderUIResource(::javax::swing::border::Border *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-public: // actually package-private
-  static const jlong serialVersionUID = -3440553684010079691LL;
-private:
-  static ::javax::swing::border::Border * etchedBorderUIResource;
-  static ::javax::swing::border::Border * loweredBevelBorderUIResource;
-  static ::javax::swing::border::Border * raisedBevelBorderUIResource;
-  static ::javax::swing::border::Border * blackLineBorderUIResource;
-  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource__
diff --git a/libjava/javax/swing/plaf/ButtonUI.h b/libjava/javax/swing/plaf/ButtonUI.h
deleted file mode 100644
index 61cb852b83c..00000000000
--- a/libjava/javax/swing/plaf/ButtonUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ButtonUI__
-#define __javax_swing_plaf_ButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ButtonUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ButtonUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ButtonUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ButtonUI__
diff --git a/libjava/javax/swing/plaf/ColorChooserUI.h b/libjava/javax/swing/plaf/ColorChooserUI.h
deleted file mode 100644
index 9db0d0e891b..00000000000
--- a/libjava/javax/swing/plaf/ColorChooserUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ColorChooserUI__
-#define __javax_swing_plaf_ColorChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ColorChooserUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ColorChooserUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ColorChooserUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ColorChooserUI__
diff --git a/libjava/javax/swing/plaf/ColorUIResource.h b/libjava/javax/swing/plaf/ColorUIResource.h
deleted file mode 100644
index 37ef2238288..00000000000
--- a/libjava/javax/swing/plaf/ColorUIResource.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ColorUIResource__
-#define __javax_swing_plaf_ColorUIResource__
-
-#pragma interface
-
-#include <java/awt/Color.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ColorUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ColorUIResource : public ::java::awt::Color
-{
-
-public:
-  ColorUIResource(jint, jint, jint);
-  ColorUIResource(jint);
-  ColorUIResource(jfloat, jfloat, jfloat);
-  ColorUIResource(::java::awt::Color *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ColorUIResource__
diff --git a/libjava/javax/swing/plaf/ComboBoxUI.h b/libjava/javax/swing/plaf/ComboBoxUI.h
deleted file mode 100644
index bdcdfe3f0ea..00000000000
--- a/libjava/javax/swing/plaf/ComboBoxUI.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ComboBoxUI__
-#define __javax_swing_plaf_ComboBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComboBox;
-      namespace plaf
-      {
-          class ComboBoxUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ComboBoxUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ComboBoxUI();
-  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean) = 0;
-  virtual jboolean isPopupVisible(::javax::swing::JComboBox *) = 0;
-  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ComboBoxUI__
diff --git a/libjava/javax/swing/plaf/ComponentInputMapUIResource.h b/libjava/javax/swing/plaf/ComponentInputMapUIResource.h
deleted file mode 100644
index 52accf48001..00000000000
--- a/libjava/javax/swing/plaf/ComponentInputMapUIResource.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ComponentInputMapUIResource__
-#define __javax_swing_plaf_ComponentInputMapUIResource__
-
-#pragma interface
-
-#include <javax/swing/ComponentInputMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentInputMapUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ComponentInputMapUIResource : public ::javax::swing::ComponentInputMap
-{
-
-public:
-  ComponentInputMapUIResource(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ComponentInputMapUIResource__
diff --git a/libjava/javax/swing/plaf/ComponentUI.h b/libjava/javax/swing/plaf/ComponentUI.h
deleted file mode 100644
index 3f14af6c89e..00000000000
--- a/libjava/javax/swing/plaf/ComponentUI.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ComponentUI__
-#define __javax_swing_plaf_ComponentUI__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ComponentUI : public ::java::lang::Object
-{
-
-public:
-  ComponentUI();
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ComponentUI__
diff --git a/libjava/javax/swing/plaf/DesktopIconUI.h b/libjava/javax/swing/plaf/DesktopIconUI.h
deleted file mode 100644
index 6f3fb24d68e..00000000000
--- a/libjava/javax/swing/plaf/DesktopIconUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_DesktopIconUI__
-#define __javax_swing_plaf_DesktopIconUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class DesktopIconUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::DesktopIconUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  DesktopIconUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_DesktopIconUI__
diff --git a/libjava/javax/swing/plaf/DesktopPaneUI.h b/libjava/javax/swing/plaf/DesktopPaneUI.h
deleted file mode 100644
index 308120dc131..00000000000
--- a/libjava/javax/swing/plaf/DesktopPaneUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_DesktopPaneUI__
-#define __javax_swing_plaf_DesktopPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class DesktopPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::DesktopPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  DesktopPaneUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_DesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/DimensionUIResource.h b/libjava/javax/swing/plaf/DimensionUIResource.h
deleted file mode 100644
index 620a35d05c2..00000000000
--- a/libjava/javax/swing/plaf/DimensionUIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_DimensionUIResource__
-#define __javax_swing_plaf_DimensionUIResource__
-
-#pragma interface
-
-#include <java/awt/Dimension.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class DimensionUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::DimensionUIResource : public ::java::awt::Dimension
-{
-
-public:
-  DimensionUIResource(jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_DimensionUIResource__
diff --git a/libjava/javax/swing/plaf/FileChooserUI.h b/libjava/javax/swing/plaf/FileChooserUI.h
deleted file mode 100644
index 3a166bac0aa..00000000000
--- a/libjava/javax/swing/plaf/FileChooserUI.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_FileChooserUI__
-#define __javax_swing_plaf_FileChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-      namespace filechooser
-      {
-          class FileFilter;
-          class FileView;
-      }
-      namespace plaf
-      {
-          class FileChooserUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::FileChooserUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  FileChooserUI();
-  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *) = 0;
-  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *) = 0;
-  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *) = 0;
-  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *) = 0;
-  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *) = 0;
-  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_FileChooserUI__
diff --git a/libjava/javax/swing/plaf/FontUIResource.h b/libjava/javax/swing/plaf/FontUIResource.h
deleted file mode 100644
index 4f2b8353ba0..00000000000
--- a/libjava/javax/swing/plaf/FontUIResource.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_FontUIResource__
-#define __javax_swing_plaf_FontUIResource__
-
-#pragma interface
-
-#include <java/awt/Font.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class FontUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::FontUIResource : public ::java::awt::Font
-{
-
-public:
-  FontUIResource(::java::lang::String *, jint, jint);
-  FontUIResource(::java::awt::Font *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_FontUIResource__
diff --git a/libjava/javax/swing/plaf/IconUIResource.h b/libjava/javax/swing/plaf/IconUIResource.h
deleted file mode 100644
index f1e7047494c..00000000000
--- a/libjava/javax/swing/plaf/IconUIResource.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_IconUIResource__
-#define __javax_swing_plaf_IconUIResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-          class IconUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::IconUIResource : public ::java::lang::Object
-{
-
-public:
-  IconUIResource(::javax::swing::Icon *);
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-public: // actually package-private
-  static const jlong serialVersionUID = 3327049506004830542LL;
-private:
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_IconUIResource__
diff --git a/libjava/javax/swing/plaf/InputMapUIResource.h b/libjava/javax/swing/plaf/InputMapUIResource.h
deleted file mode 100644
index 448fc817ee2..00000000000
--- a/libjava/javax/swing/plaf/InputMapUIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_InputMapUIResource__
-#define __javax_swing_plaf_InputMapUIResource__
-
-#pragma interface
-
-#include <javax/swing/InputMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class InputMapUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::InputMapUIResource : public ::javax::swing::InputMap
-{
-
-public:
-  InputMapUIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_InputMapUIResource__
diff --git a/libjava/javax/swing/plaf/InsetsUIResource.h b/libjava/javax/swing/plaf/InsetsUIResource.h
deleted file mode 100644
index f9621375d95..00000000000
--- a/libjava/javax/swing/plaf/InsetsUIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_InsetsUIResource__
-#define __javax_swing_plaf_InsetsUIResource__
-
-#pragma interface
-
-#include <java/awt/Insets.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class InsetsUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::InsetsUIResource : public ::java::awt::Insets
-{
-
-public:
-  InsetsUIResource(jint, jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 5622110143266315421LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_InsetsUIResource__
diff --git a/libjava/javax/swing/plaf/InternalFrameUI.h b/libjava/javax/swing/plaf/InternalFrameUI.h
deleted file mode 100644
index 1aa4f76afd9..00000000000
--- a/libjava/javax/swing/plaf/InternalFrameUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_InternalFrameUI__
-#define __javax_swing_plaf_InternalFrameUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class InternalFrameUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::InternalFrameUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  InternalFrameUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_InternalFrameUI__
diff --git a/libjava/javax/swing/plaf/LabelUI.h b/libjava/javax/swing/plaf/LabelUI.h
deleted file mode 100644
index 018087af033..00000000000
--- a/libjava/javax/swing/plaf/LabelUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_LabelUI__
-#define __javax_swing_plaf_LabelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class LabelUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::LabelUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  LabelUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_LabelUI__
diff --git a/libjava/javax/swing/plaf/ListUI.h b/libjava/javax/swing/plaf/ListUI.h
deleted file mode 100644
index 241768f021b..00000000000
--- a/libjava/javax/swing/plaf/ListUI.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ListUI__
-#define __javax_swing_plaf_ListUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-          class ListUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ListUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ListUI();
-  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *) = 0;
-  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint) = 0;
-  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ListUI__
diff --git a/libjava/javax/swing/plaf/MenuBarUI.h b/libjava/javax/swing/plaf/MenuBarUI.h
deleted file mode 100644
index cf2aba65494..00000000000
--- a/libjava/javax/swing/plaf/MenuBarUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_MenuBarUI__
-#define __javax_swing_plaf_MenuBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class MenuBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::MenuBarUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  MenuBarUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_MenuBarUI__
diff --git a/libjava/javax/swing/plaf/MenuItemUI.h b/libjava/javax/swing/plaf/MenuItemUI.h
deleted file mode 100644
index 9f4692bd89f..00000000000
--- a/libjava/javax/swing/plaf/MenuItemUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_MenuItemUI__
-#define __javax_swing_plaf_MenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ButtonUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class MenuItemUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::MenuItemUI : public ::javax::swing::plaf::ButtonUI
-{
-
-public:
-  MenuItemUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_MenuItemUI__
diff --git a/libjava/javax/swing/plaf/OptionPaneUI.h b/libjava/javax/swing/plaf/OptionPaneUI.h
deleted file mode 100644
index 1dbd6b8c896..00000000000
--- a/libjava/javax/swing/plaf/OptionPaneUI.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_OptionPaneUI__
-#define __javax_swing_plaf_OptionPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JOptionPane;
-      namespace plaf
-      {
-          class OptionPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::OptionPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  OptionPaneUI();
-  virtual void selectInitialValue(::javax::swing::JOptionPane *) = 0;
-  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_OptionPaneUI__
diff --git a/libjava/javax/swing/plaf/PanelUI.h b/libjava/javax/swing/plaf/PanelUI.h
deleted file mode 100644
index 9b962235b9f..00000000000
--- a/libjava/javax/swing/plaf/PanelUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_PanelUI__
-#define __javax_swing_plaf_PanelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class PanelUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::PanelUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  PanelUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_PanelUI__
diff --git a/libjava/javax/swing/plaf/PopupMenuUI.h b/libjava/javax/swing/plaf/PopupMenuUI.h
deleted file mode 100644
index 16aa6b5a1d7..00000000000
--- a/libjava/javax/swing/plaf/PopupMenuUI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_PopupMenuUI__
-#define __javax_swing_plaf_PopupMenuUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class Popup;
-      namespace plaf
-      {
-          class PopupMenuUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::PopupMenuUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  PopupMenuUI();
-  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
-  virtual ::javax::swing::Popup * getPopup(::javax::swing::JPopupMenu *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_PopupMenuUI__
diff --git a/libjava/javax/swing/plaf/ProgressBarUI.h b/libjava/javax/swing/plaf/ProgressBarUI.h
deleted file mode 100644
index d9e6714acc8..00000000000
--- a/libjava/javax/swing/plaf/ProgressBarUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ProgressBarUI__
-#define __javax_swing_plaf_ProgressBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ProgressBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ProgressBarUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ProgressBarUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ProgressBarUI__
diff --git a/libjava/javax/swing/plaf/RootPaneUI.h b/libjava/javax/swing/plaf/RootPaneUI.h
deleted file mode 100644
index 3e82895d7c2..00000000000
--- a/libjava/javax/swing/plaf/RootPaneUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_RootPaneUI__
-#define __javax_swing_plaf_RootPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class RootPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::RootPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  RootPaneUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_RootPaneUI__
diff --git a/libjava/javax/swing/plaf/ScrollBarUI.h b/libjava/javax/swing/plaf/ScrollBarUI.h
deleted file mode 100644
index 24854eff2aa..00000000000
--- a/libjava/javax/swing/plaf/ScrollBarUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ScrollBarUI__
-#define __javax_swing_plaf_ScrollBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ScrollBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ScrollBarUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ScrollBarUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ScrollBarUI__
diff --git a/libjava/javax/swing/plaf/ScrollPaneUI.h b/libjava/javax/swing/plaf/ScrollPaneUI.h
deleted file mode 100644
index 7253175358d..00000000000
--- a/libjava/javax/swing/plaf/ScrollPaneUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ScrollPaneUI__
-#define __javax_swing_plaf_ScrollPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ScrollPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ScrollPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ScrollPaneUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/SeparatorUI.h b/libjava/javax/swing/plaf/SeparatorUI.h
deleted file mode 100644
index c968d73cc55..00000000000
--- a/libjava/javax/swing/plaf/SeparatorUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_SeparatorUI__
-#define __javax_swing_plaf_SeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class SeparatorUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::SeparatorUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  SeparatorUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_SeparatorUI__
diff --git a/libjava/javax/swing/plaf/SliderUI.h b/libjava/javax/swing/plaf/SliderUI.h
deleted file mode 100644
index bc18a5f739f..00000000000
--- a/libjava/javax/swing/plaf/SliderUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_SliderUI__
-#define __javax_swing_plaf_SliderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class SliderUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::SliderUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  SliderUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_SliderUI__
diff --git a/libjava/javax/swing/plaf/SpinnerUI.h b/libjava/javax/swing/plaf/SpinnerUI.h
deleted file mode 100644
index c20f12d9216..00000000000
--- a/libjava/javax/swing/plaf/SpinnerUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_SpinnerUI__
-#define __javax_swing_plaf_SpinnerUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class SpinnerUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::SpinnerUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  SpinnerUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_SpinnerUI__
diff --git a/libjava/javax/swing/plaf/SplitPaneUI.h b/libjava/javax/swing/plaf/SplitPaneUI.h
deleted file mode 100644
index 31c1ec1699c..00000000000
--- a/libjava/javax/swing/plaf/SplitPaneUI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_SplitPaneUI__
-#define __javax_swing_plaf_SplitPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSplitPane;
-      namespace plaf
-      {
-          class SplitPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::SplitPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  SplitPaneUI();
-  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *) = 0;
-  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint) = 0;
-  virtual jint getDividerLocation(::javax::swing::JSplitPane *) = 0;
-  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *) = 0;
-  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *) = 0;
-  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_SplitPaneUI__
diff --git a/libjava/javax/swing/plaf/TabbedPaneUI.h b/libjava/javax/swing/plaf/TabbedPaneUI.h
deleted file mode 100644
index 725554a386e..00000000000
--- a/libjava/javax/swing/plaf/TabbedPaneUI.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TabbedPaneUI__
-#define __javax_swing_plaf_TabbedPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTabbedPane;
-      namespace plaf
-      {
-          class TabbedPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TabbedPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TabbedPaneUI();
-  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint) = 0;
-  virtual jint getTabRunCount(::javax::swing::JTabbedPane *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/TableHeaderUI.h b/libjava/javax/swing/plaf/TableHeaderUI.h
deleted file mode 100644
index cc0c5c8f383..00000000000
--- a/libjava/javax/swing/plaf/TableHeaderUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TableHeaderUI__
-#define __javax_swing_plaf_TableHeaderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class TableHeaderUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TableHeaderUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TableHeaderUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TableHeaderUI__
diff --git a/libjava/javax/swing/plaf/TableUI.h b/libjava/javax/swing/plaf/TableUI.h
deleted file mode 100644
index 5e8c51d777b..00000000000
--- a/libjava/javax/swing/plaf/TableUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TableUI__
-#define __javax_swing_plaf_TableUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class TableUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TableUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TableUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TableUI__
diff --git a/libjava/javax/swing/plaf/TextUI.h b/libjava/javax/swing/plaf/TextUI.h
deleted file mode 100644
index 1c4faf66d82..00000000000
--- a/libjava/javax/swing/plaf/TextUI.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TextUI__
-#define __javax_swing_plaf_TextUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class TextUI;
-      }
-      namespace text
-      {
-          class EditorKit;
-          class JTextComponent;
-          class Position$Bias;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TextUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TextUI();
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint) = 0;
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *) = 0;
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *) = 0;
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint) = 0;
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *) = 0;
-  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *) = 0;
-  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *) = 0;
-  virtual ::java::lang::String * getToolTipText(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TextUI__
diff --git a/libjava/javax/swing/plaf/ToolBarUI.h b/libjava/javax/swing/plaf/ToolBarUI.h
deleted file mode 100644
index 79600b2a9fd..00000000000
--- a/libjava/javax/swing/plaf/ToolBarUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ToolBarUI__
-#define __javax_swing_plaf_ToolBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ToolBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ToolBarUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ToolBarUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ToolBarUI__
diff --git a/libjava/javax/swing/plaf/ToolTipUI.h b/libjava/javax/swing/plaf/ToolTipUI.h
deleted file mode 100644
index 2c061abb8b3..00000000000
--- a/libjava/javax/swing/plaf/ToolTipUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ToolTipUI__
-#define __javax_swing_plaf_ToolTipUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ToolTipUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ToolTipUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ToolTipUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ToolTipUI__
diff --git a/libjava/javax/swing/plaf/TreeUI.h b/libjava/javax/swing/plaf/TreeUI.h
deleted file mode 100644
index 69bbc1215d8..00000000000
--- a/libjava/javax/swing/plaf/TreeUI.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TreeUI__
-#define __javax_swing_plaf_TreeUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-      namespace plaf
-      {
-          class TreeUI;
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TreeUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TreeUI();
-  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
-  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint) = 0;
-  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
-  virtual jint getRowCount(::javax::swing::JTree *) = 0;
-  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint) = 0;
-  virtual jboolean isEditing(::javax::swing::JTree *) = 0;
-  virtual jboolean stopEditing(::javax::swing::JTree *) = 0;
-  virtual void cancelEditing(::javax::swing::JTree *) = 0;
-  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
-  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TreeUI__
diff --git a/libjava/javax/swing/plaf/UIResource.h b/libjava/javax/swing/plaf/UIResource.h
deleted file mode 100644
index 0ddd789264d..00000000000
--- a/libjava/javax/swing/plaf/UIResource.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_UIResource__
-#define __javax_swing_plaf_UIResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class UIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::UIResource : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_plaf_UIResource__
diff --git a/libjava/javax/swing/plaf/ViewportUI.h b/libjava/javax/swing/plaf/ViewportUI.h
deleted file mode 100644
index 64855b17a9a..00000000000
--- a/libjava/javax/swing/plaf/ViewportUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ViewportUI__
-#define __javax_swing_plaf_ViewportUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ViewportUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ViewportUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ViewportUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ViewportUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicArrowButton.h b/libjava/javax/swing/plaf/basic/BasicArrowButton.h
deleted file mode 100644
index 033f499aaf8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicArrowButton.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicArrowButton__
-#define __javax_swing_plaf_basic_BasicArrowButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicArrowButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicArrowButton : public ::javax::swing::JButton
-{
-
-public:
-  BasicArrowButton(jint);
-  BasicArrowButton(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual jboolean isFocusTraversable();
-  virtual jint getDirection();
-  virtual void setDirection(jint);
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual void paintTriangle(::java::awt::Graphics *, jint, jint, jint, jint, jboolean);
-private:
-  void paintTriangleNorth(::java::awt::Graphics *, jint, jint, jint, jboolean);
-  void paintTriangleSouth(::java::awt::Graphics *, jint, jint, jint, jboolean);
-  void paintTriangleEast(::java::awt::Graphics *, jint, jint, jint, jboolean);
-  void paintTriangleWest(::java::awt::Graphics *, jint, jint, jint, jboolean);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) direction;
-public: // actually package-private
-  ::java::awt::Color * shadow;
-  ::java::awt::Color * darkShadow;
-  ::java::awt::Color * highlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicArrowButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
deleted file mode 100644
index b4a2c915729..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
-#define __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$ButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$ButtonBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BasicBorders$ButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = -157053874580739687LL;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
-  ::java::awt::Color * darkShadow;
-  ::java::awt::Color * highlight;
-  ::java::awt::Color * lightHighlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
deleted file mode 100644
index 455b711c0ce..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$FieldBorder__
-#define __javax_swing_plaf_basic_BasicBorders$FieldBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$FieldBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$FieldBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BasicBorders$FieldBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = 949220756998454908LL;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
-  ::java::awt::Color * darkShadow;
-  ::java::awt::Color * highlight;
-  ::java::awt::Color * lightHighlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$FieldBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
deleted file mode 100644
index a974a460a8d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$MarginBorder__
-#define __javax_swing_plaf_basic_BasicBorders$MarginBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$MarginBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$MarginBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BasicBorders$MarginBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = -3035848353448896090LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$MarginBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
deleted file mode 100644
index fcf26ba5918..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
-#define __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$MenuBarBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$MenuBarBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BasicBorders$MenuBarBorder(::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = -6909056571935227506LL;
-private:
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
-  ::java::awt::Color * highlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
deleted file mode 100644
index b737890ede1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
-#define __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$RadioButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$RadioButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
-{
-
-public:
-  BasicBorders$RadioButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = 1596945751743747369LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
deleted file mode 100644
index 84d6ee07631..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
-#define __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$RolloverButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$RolloverButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
-{
-
-public:
-  BasicBorders$RolloverButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 1976364864896996846LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
deleted file mode 100644
index 3a7d22f30aa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
-#define __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$SplitPaneBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$SplitPaneBorder : public ::java::lang::Object
-{
-
-public:
-  BasicBorders$SplitPaneBorder(::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  void paintRect(::java::awt::Graphics *, jint, jboolean, jint, jint, ::java::awt::Rectangle *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-private:
-  static const jint SUPPRESS_TOP = 1;
-  static const jint SUPPRESS_LEFT = 2;
-  static const jint SUPPRESS_BOTTOM = 4;
-  static const jint SUPPRESS_RIGHT = 8;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) highlight;
-  ::java::awt::Color * shadow;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
deleted file mode 100644
index 90a89464be5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
-#define __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSplitPane;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$SplitPaneDividerBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$SplitPaneDividerBorder : public ::java::lang::Object
-{
-
-public:
-  BasicBorders$SplitPaneDividerBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-private:
-  ::javax::swing::JSplitPane * getSplitPane(::java::awt::Component *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
deleted file mode 100644
index 73d1f1c4e67..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
-#define __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$ToggleButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$ToggleButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
-{
-
-public:
-  BasicBorders$ToggleButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = -3528666548001058394LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders.h b/libjava/javax/swing/plaf/basic/BasicBorders.h
deleted file mode 100644
index e32e2b266c3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders__
-#define __javax_swing_plaf_basic_BasicBorders__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders;
-            class BasicBorders$MarginBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders : public ::java::lang::Object
-{
-
-public:
-  BasicBorders();
-  static ::javax::swing::border::Border * getButtonBorder();
-  static ::javax::swing::border::Border * getRadioButtonBorder();
-  static ::javax::swing::border::Border * getToggleButtonBorder();
-  static ::javax::swing::border::Border * getMenuBarBorder();
-  static ::javax::swing::border::Border * getSplitPaneBorder();
-  static ::javax::swing::border::Border * getSplitPaneDividerBorder();
-  static ::javax::swing::border::Border * getTextFieldBorder();
-  static ::javax::swing::border::Border * getProgressBarBorder();
-  static ::javax::swing::border::Border * getInternalFrameBorder();
-public: // actually package-private
-  static ::javax::swing::border::Border * getMarginBorder();
-private:
-  static ::javax::swing::plaf::basic::BasicBorders$MarginBorder * sharedMarginBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
deleted file mode 100644
index 85f3a162baf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonListener$1__
-#define __javax_swing_plaf_basic_BasicButtonListener$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicButtonListener;
-            class BasicButtonListener$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonListener$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicButtonListener$1(::javax::swing::plaf::basic::BasicButtonListener *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonListener$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
deleted file mode 100644
index fe6dd492a87..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonListener$2__
-#define __javax_swing_plaf_basic_BasicButtonListener$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicButtonListener;
-            class BasicButtonListener$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonListener$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicButtonListener$2(::javax::swing::plaf::basic::BasicButtonListener *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonListener$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
deleted file mode 100644
index 6e08aa431f0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
-#define __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicButtonListener;
-            class BasicButtonListener$ButtonAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonListener$ButtonAction : public ::javax::swing::AbstractAction
-{
-
-  BasicButtonListener$ButtonAction(::javax::swing::plaf::basic::BasicButtonListener *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled(::java::lang::Object *);
-public: // actually package-private
-  BasicButtonListener$ButtonAction(::javax::swing::plaf::basic::BasicButtonListener *, ::javax::swing::plaf::basic::BasicButtonListener$ButtonAction *);
-  static ::java::lang::String * PRESSED;
-  static ::java::lang::String * RELEASED;
-  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.h b/libjava/javax/swing/plaf/basic/BasicButtonListener.h
deleted file mode 100644
index 8b7cd51d2eb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonListener__
-#define __javax_swing_plaf_basic_BasicButtonListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class ActionMap;
-        class JComponent;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicButtonListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonListener : public ::java::lang::Object
-{
-
-public:
-  BasicButtonListener(::javax::swing::AbstractButton *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually protected
-  virtual void checkOpacity(::javax::swing::AbstractButton *);
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-  virtual void installKeyboardActions(::javax::swing::JComponent *);
-private:
-  ::javax::swing::ActionMap * createDefaultActionMap();
-public:
-  virtual void uninstallKeyboardActions(::javax::swing::JComponent *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.h b/libjava/javax/swing/plaf/basic/BasicButtonUI.h
deleted file mode 100644
index c7209c0a312..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonUI.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonUI__
-#define __javax_swing_plaf_basic_BasicButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class Icon;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicButtonListener;
-            class BasicButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonUI : public ::javax::swing::plaf::ButtonUI
-{
-
-public:
-  BasicButtonUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual jint getDefaultTextIconGap(::javax::swing::AbstractButton *);
-public: // actually protected
-  virtual void clearTextShiftOffset();
-  virtual jint getTextShiftOffset();
-  virtual void setTextShiftOffset();
-  virtual ::java::lang::String * getPropertyPrefix();
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
-  virtual ::javax::swing::plaf::basic::BasicButtonListener * createButtonListener(::javax::swing::AbstractButton *);
-  virtual void installListeners(::javax::swing::AbstractButton *);
-  virtual void uninstallListeners(::javax::swing::AbstractButton *);
-  virtual void installKeyboardActions(::javax::swing::AbstractButton *);
-  virtual void uninstallKeyboardActions(::javax::swing::AbstractButton *);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually package-private
-  static ::javax::swing::Icon * currentIcon(::javax::swing::AbstractButton *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  virtual void paintIcon(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::lang::String *);
-private:
-  ::javax::swing::plaf::basic::BasicButtonListener * getButtonListener(::javax::swing::AbstractButton *);
-public: // actually package-private
-  static ::java::awt::Rectangle * viewR;
-  static ::java::awt::Rectangle * iconR;
-  static ::java::awt::Rectangle * textR;
-  static ::java::awt::Insets * cachedInsets;
-private:
-  static ::javax::swing::plaf::basic::BasicButtonUI * sharedUI;
-  static ::javax::swing::plaf::basic::BasicButtonListener * sharedListener;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::ButtonUI)))) defaultTextIconGap;
-  jint defaultTextShiftOffset;
-private:
-  jint textShiftOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
deleted file mode 100644
index 68f69f589a7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
-#define __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JMenuItem;
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicCheckBoxMenuItemUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicCheckBoxMenuItemUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
-{
-
-public:
-  BasicCheckBoxMenuItemUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void processMouseEvent(::javax::swing::JMenuItem *, ::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h b/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
deleted file mode 100644
index ca6b44b3c9f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicCheckBoxUI__
-#define __javax_swing_plaf_basic_BasicCheckBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicRadioButtonUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicCheckBoxUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicCheckBoxUI : public ::javax::swing::plaf::basic::BasicRadioButtonUI
-{
-
-public:
-  BasicCheckBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::lang::String * getPropertyPrefix();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicCheckBoxUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
deleted file mode 100644
index af943a65eed..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$1__
-#define __javax_swing_plaf_basic_BasicColorChooserUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicColorChooserUI;
-            class BasicColorChooserUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicColorChooserUI$1(::javax::swing::plaf::basic::BasicColorChooserUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
deleted file mode 100644
index a7c3a279a08..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
-#define __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicColorChooserUI;
-            class BasicColorChooserUI$PreviewListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI$PreviewListener : public ::java::lang::Object
-{
-
-  BasicColorChooserUI$PreviewListener(::javax::swing::plaf::basic::BasicColorChooserUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  BasicColorChooserUI$PreviewListener(::javax::swing::plaf::basic::BasicColorChooserUI *, ::javax::swing::plaf::basic::BasicColorChooserUI$PreviewListener *);
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
deleted file mode 100644
index ed5743feb8d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
-#define __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicColorChooserUI;
-            class BasicColorChooserUI$PropertyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI$PropertyHandler : public ::java::lang::Object
-{
-
-public:
-  BasicColorChooserUI$PropertyHandler(::javax::swing::plaf::basic::BasicColorChooserUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
deleted file mode 100644
index 3ca157fe9d9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
-#define __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicColorChooserUI;
-            class BasicColorChooserUI$TabPaneListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI$TabPaneListener : public ::java::lang::Object
-{
-
-  BasicColorChooserUI$TabPaneListener(::javax::swing::plaf::basic::BasicColorChooserUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  BasicColorChooserUI$TabPaneListener(::javax::swing::plaf::basic::BasicColorChooserUI *, ::javax::swing::plaf::basic::BasicColorChooserUI$TabPaneListener *);
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
deleted file mode 100644
index 83a41b05d81..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI__
-#define __javax_swing_plaf_basic_BasicColorChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ColorChooserUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JColorChooser;
-        class JComponent;
-        class JTabbedPane;
-      namespace colorchooser
-      {
-          class AbstractColorChooserPanel;
-      }
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicColorChooserUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI : public ::javax::swing::plaf::ColorChooserUI
-{
-
-public:
-  BasicColorChooserUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * createDefaultChoosers();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually package-private
-  virtual void makeTabs(JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > *);
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaultChoosers();
-  virtual void installPreviewPanel();
-public: // actually package-private
-  virtual void updatePreviewPanel(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void uninstallListeners();
-  JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ColorChooserUI)))) defaultChoosers;
-  ::javax::swing::event::ChangeListener * previewListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::JColorChooser * chooser;
-public: // actually package-private
-  ::javax::swing::JTabbedPane * pane;
-private:
-  ::java::awt::Container * prevContainer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
deleted file mode 100644
index 36a4682b0ac..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
-#define __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxEditor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxEditor$UIResource;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxEditor$UIResource : public ::javax::swing::plaf::basic::BasicComboBoxEditor
-{
-
-public:
-  BasicComboBoxEditor$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
deleted file mode 100644
index 5bde099f2ba..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxEditor__
-#define __javax_swing_plaf_basic_BasicComboBoxEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class ActionListener;
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTextField;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxEditor;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxEditor : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxEditor();
-  virtual ::java::awt::Component * getEditorComponent();
-  virtual void setItem(::java::lang::Object *);
-  virtual ::java::lang::Object * getItem();
-  virtual void selectAll();
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-public: // actually protected
-  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) editor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxEditor__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
deleted file mode 100644
index 76eaa5c09f7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
-#define __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxRenderer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxRenderer$UIResource;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxRenderer$UIResource : public ::javax::swing::plaf::basic::BasicComboBoxRenderer
-{
-
-public:
-  BasicComboBoxRenderer$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
deleted file mode 100644
index 746cf3ce132..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxRenderer__
-#define __javax_swing_plaf_basic_BasicComboBoxRenderer__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxRenderer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxRenderer : public ::javax::swing::JLabel
-{
-
-public:
-  BasicComboBoxRenderer();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-public: // actually protected
-  static ::javax::swing::border::Border * noFocusBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
deleted file mode 100644
index e907fe231e4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$ComboBoxLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$ComboBoxLayoutManager(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
deleted file mode 100644
index e5f84c171c8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$FocusHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
deleted file mode 100644
index e07a4649409..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$ItemHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$ItemHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$ItemHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
deleted file mode 100644
index b2657b802cb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
-
-#pragma interface
-
-#include <java/awt/event/KeyAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$KeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$KeyHandler : public ::java::awt::event::KeyAdapter
-{
-
-public:
-  BasicComboBoxUI$KeyHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
deleted file mode 100644
index 8647c7fd412..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$ListDataHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$ListDataHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$ListDataHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
deleted file mode 100644
index 987d5406e2b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
deleted file mode 100644
index 77f1f53d41c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
+++ /dev/null
@@ -1,154 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI__
-#define __javax_swing_plaf_basic_BasicComboBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComboBoxUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class LayoutManager;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-          class ItemListener;
-          class KeyListener;
-          class MouseListener;
-          class MouseMotionListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class CellRendererPane;
-        class ComboBoxEditor;
-        class JButton;
-        class JComboBox;
-        class JComponent;
-        class JList;
-        class ListCellRenderer;
-      namespace event
-      {
-          class ListDataListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class ComboPopup;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI : public ::javax::swing::plaf::ComboBoxUI
-{
-
-public:
-  BasicComboBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installListeners();
-  virtual void uninstallDefaults();
-  virtual void uninstallListeners();
-  virtual ::javax::swing::plaf::basic::ComboPopup * createPopup();
-  virtual ::java::awt::event::KeyListener * createKeyListener();
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::javax::swing::event::ListDataListener * createListDataListener();
-  virtual ::java::awt::event::ItemListener * createItemListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual ::javax::swing::ListCellRenderer * createRenderer();
-  virtual ::javax::swing::ComboBoxEditor * createEditor();
-  virtual void installComponents();
-  virtual void uninstallComponents();
-public:
-  virtual void addEditor();
-  virtual void removeEditor();
-public: // actually protected
-  virtual void configureEditor();
-  virtual void unconfigureEditor();
-public:
-  virtual void configureArrowButton();
-  virtual void unconfigureArrowButton();
-public: // actually protected
-  virtual ::javax::swing::JButton * createArrowButton();
-public:
-  virtual jboolean isPopupVisible(::javax::swing::JComboBox *);
-  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean);
-  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  virtual jboolean isNavigationKey(jint);
-  virtual void selectNextPossibleValue();
-  virtual void selectPreviousPossibleValue();
-  virtual void toggleOpenClose();
-  virtual ::java::awt::Rectangle * rectangleForCurrentValue();
-  virtual ::java::awt::Insets * getInsets();
-public:
-  virtual void paintCurrentValue(::java::awt::Graphics *, ::java::awt::Rectangle *, jboolean);
-  virtual void paintCurrentValueBackground(::java::awt::Graphics *, ::java::awt::Rectangle *, jboolean);
-public: // actually protected
-  virtual ::java::awt::Dimension * getDefaultSize();
-  virtual ::java::awt::Dimension * getDisplaySize();
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-  ::javax::swing::JButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ComboBoxUI)))) arrowButton;
-  ::javax::swing::JComboBox * comboBox;
-  ::java::awt::Component * editor;
-  ::java::awt::event::FocusListener * focusListener;
-  jboolean hasFocus;
-  ::java::awt::event::ItemListener * itemListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::javax::swing::JList * listBox;
-  ::javax::swing::event::ListDataListener * listDataListener;
-  ::javax::swing::plaf::basic::ComboPopup * popup;
-  ::java::awt::event::KeyListener * popupKeyListener;
-  ::java::awt::event::MouseListener * popupMouseListener;
-  ::java::awt::event::MouseMotionListener * popupMouseMotionListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public: // actually package-private
-  ::java::awt::Dimension * displaySize;
-public: // actually protected
-  ::javax::swing::CellRendererPane * currentValuePane;
-  ::java::awt::Dimension * cachedMinimumSize;
-  jboolean isMinimumSizeDirty;
-private:
-  static ::javax::swing::ListCellRenderer * DEFAULT_RENDERER;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
deleted file mode 100644
index ecf7e1b8ef1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
-
-#pragma interface
-
-#include <java/awt/event/KeyAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$InvocationKeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$InvocationKeyHandler : public ::java::awt::event::KeyAdapter
-{
-
-public:
-  BasicComboPopup$InvocationKeyHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
deleted file mode 100644
index b04fb475d3a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$InvocationMouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$InvocationMouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicComboPopup$InvocationMouseHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
deleted file mode 100644
index b8c7bae477e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseMotionAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$InvocationMouseMotionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$InvocationMouseMotionHandler : public ::java::awt::event::MouseMotionAdapter
-{
-
-public: // actually protected
-  BasicComboPopup$InvocationMouseMotionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseMotionAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
deleted file mode 100644
index 017c66bce0c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ItemHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ItemHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicComboPopup$ItemHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
deleted file mode 100644
index d7924a453bc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ListDataHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ListDataHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboPopup$ListDataHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
deleted file mode 100644
index 84b748854d3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ListMouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ListMouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicComboPopup$ListMouseHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
deleted file mode 100644
index d772569baf4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseMotionAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ListMouseMotionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ListMouseMotionHandler : public ::java::awt::event::MouseMotionAdapter
-{
-
-public: // actually protected
-  BasicComboPopup$ListMouseMotionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseMotionAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
deleted file mode 100644
index dd3caad107f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ListSelectionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ListSelectionHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicComboPopup$ListSelectionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
deleted file mode 100644
index 5bff9aa4c19..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicComboPopup$PropertyChangeHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup.h b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
deleted file mode 100644
index 7dfc5250628..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup__
-#define __javax_swing_plaf_basic_BasicComboPopup__
-
-#pragma interface
-
-#include <javax/swing/JPopupMenu.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace event
-      {
-          class ItemListener;
-          class KeyListener;
-          class MouseEvent;
-          class MouseListener;
-          class MouseMotionListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxModel;
-        class JComboBox;
-        class JList;
-        class JScrollPane;
-        class Timer;
-      namespace event
-      {
-          class ListDataListener;
-          class ListSelectionListener;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup : public ::javax::swing::JPopupMenu
-{
-
-public:
-  BasicComboPopup(::javax::swing::JComboBox *);
-  virtual void show();
-  virtual void hide();
-  virtual ::javax::swing::JList * getList();
-  virtual ::java::awt::event::MouseListener * getMouseListener();
-  virtual ::java::awt::event::MouseMotionListener * getMouseMotionListener();
-  virtual ::java::awt::event::KeyListener * getKeyListener();
-  virtual void uninstallingUI();
-public: // actually protected
-  virtual void uninstallComboBoxModelListeners(::javax::swing::ComboBoxModel *);
-  virtual void uninstallKeyboardActions();
-  virtual void firePopupMenuWillBecomeVisible();
-  virtual void firePopupMenuWillBecomeInvisible();
-  virtual void firePopupMenuCanceled();
-  virtual ::java::awt::event::MouseListener * createMouseListener();
-  virtual ::java::awt::event::MouseMotionListener * createMouseMotionListener();
-  virtual ::java::awt::event::KeyListener * createKeyListener();
-  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener();
-  virtual ::javax::swing::event::ListDataListener * createListDataListener();
-  virtual ::java::awt::event::MouseListener * createListMouseListener();
-  virtual ::java::awt::event::MouseMotionListener * createListMouseMotionListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::event::ItemListener * createItemListener();
-  virtual ::javax::swing::JList * createList();
-  virtual void configureList();
-  virtual void installListListeners();
-  virtual ::javax::swing::JScrollPane * createScroller();
-  virtual void configureScroller();
-  virtual void configurePopup();
-  virtual void installComboBoxListeners();
-  virtual void installComboBoxModelListeners(::javax::swing::ComboBoxModel *);
-  virtual void installKeyboardActions();
-public:
-  virtual jboolean isFocusTraversable();
-public: // actually protected
-  virtual void startAutoScrolling(jint);
-  virtual void stopAutoScrolling();
-  virtual void autoScrollUp();
-  virtual void autoScrollDown();
-  virtual void delegateFocus(::java::awt::event::MouseEvent *);
-  virtual void togglePopup();
-  virtual ::java::awt::event::MouseEvent * convertMouseEvent(::java::awt::event::MouseEvent *);
-  virtual jint getPopupHeightForRowCount(jint);
-  virtual ::java::awt::Rectangle * computePopupBounds(jint, jint, jint, jint);
-  virtual void updateListBoxSelectionForEvent(::java::awt::event::MouseEvent *, jboolean);
-private:
-  void uninstallListListeners();
-public: // actually package-private
-  virtual void syncListSelection();
-public: // actually protected
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::javax::swing::JPopupMenu)))) autoscrollTimer;
-  ::javax::swing::JComboBox * comboBox;
-  jboolean hasEntered;
-  jboolean isAutoScrolling;
-  ::java::awt::event::ItemListener * itemListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::javax::swing::JList * list;
-  ::javax::swing::event::ListDataListener * listDataListener;
-  ::java::awt::event::MouseListener * listMouseListener;
-  ::java::awt::event::MouseMotionListener * listMouseMotionListener;
-  ::javax::swing::event::ListSelectionListener * listSelectionListener;
-  ::java::awt::event::MouseListener * mouseListener;
-  ::java::awt::event::MouseMotionListener * mouseMotionListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  static const jint SCROLL_DOWN = 1;
-  static const jint SCROLL_UP = 0;
-  jint scrollDirection;
-  ::javax::swing::JScrollPane * scroller;
-  jboolean valueIsAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
deleted file mode 100644
index 1be1e4ca30e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$1__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDesktopIconUI$1(::javax::swing::plaf::basic::BasicDesktopIconUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
deleted file mode 100644
index cfa445f115d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$2__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDesktopIconUI$2(::javax::swing::plaf::basic::BasicDesktopIconUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
deleted file mode 100644
index 7a67871449f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$BoundButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$BoundButton : public ::javax::swing::JButton
-{
-
-public:
-  BasicDesktopIconUI$BoundButton(::javax::swing::plaf::basic::BasicDesktopIconUI *, ::java::lang::String *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
deleted file mode 100644
index cfce73806cf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$DesktopIconBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$DesktopIconBorder : public ::java::lang::Object
-{
-
-  BasicDesktopIconUI$DesktopIconBorder(::javax::swing::plaf::basic::BasicDesktopIconUI *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually package-private
-  BasicDesktopIconUI$DesktopIconBorder(::javax::swing::plaf::basic::BasicDesktopIconUI *, ::javax::swing::plaf::basic::BasicDesktopIconUI$DesktopIconBorder *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
-  jint top;
-  jint right;
-  jint bottom;
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
deleted file mode 100644
index 4a53e9a62c8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI$InternalFrameDefaultMenuIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$InternalFrameDefaultMenuIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDesktopIconUI$InternalFrameDefaultMenuIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
deleted file mode 100644
index 0829e1ff9b4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
-
-#pragma interface
-
-#include <javax/swing/event/MouseInputAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JDesktopPane;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$MouseInputHandler : public ::javax::swing::event::MouseInputAdapter
-{
-
-public:
-  BasicDesktopIconUI$MouseInputHandler(::javax::swing::plaf::basic::BasicDesktopIconUI *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void moveAndRepaint(::javax::swing::JComponent *, jint, jint, jint, jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) xOffset;
-  jint yOffset;
-  ::javax::swing::JDesktopPane * pane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
deleted file mode 100644
index bafff1a0692..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/DesktopIconUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Insets;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JInternalFrame;
-        class JInternalFrame$JDesktopIcon;
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$BoundButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI : public ::javax::swing::plaf::DesktopIconUI
-{
-
-public:
-  BasicDesktopIconUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installComponents();
-  virtual void uninstallComponents();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Insets * getInsets(::javax::swing::JComponent *);
-  virtual void deiconize();
-private:
-  static const jint iconSize = 16;
-  static const jint iconWidth = 160;
-  static const jint iconHeight = 35;
-public: // actually protected
-  ::javax::swing::JInternalFrame$JDesktopIcon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopIconUI)))) desktopIcon;
-  ::javax::swing::JInternalFrame * frame;
-private:
-  ::javax::swing::event::MouseInputListener * mouseHandler;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI$BoundButton * button;
-private:
-  ::java::beans::PropertyChangeListener * propertyHandler;
-public: // actually package-private
-  static ::javax::swing::Icon * defaultIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
deleted file mode 100644
index da7e843ab7c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$CloseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$CloseAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$CloseAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
deleted file mode 100644
index 2733cec79fa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$MaximizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$MaximizeAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$MaximizeAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
deleted file mode 100644
index c834c71de9c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$MinimizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$MinimizeAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$MinimizeAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
deleted file mode 100644
index b327f1cb3d4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$NavigateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$NavigateAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$NavigateAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
deleted file mode 100644
index 0fc733b6f15..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$OpenAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$OpenAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$OpenAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
deleted file mode 100644
index c67ca088d26..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/DesktopPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DesktopManager;
-        class JComponent;
-        class JDesktopPane;
-        class KeyStroke;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI : public ::javax::swing::plaf::DesktopPaneUI
-{
-
-public:
-  BasicDesktopPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installDesktopManager();
-  virtual void installKeyboardActions();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void registerKeyboardActions();
-  virtual void uninstallDefaults();
-  virtual void uninstallDesktopManager();
-  virtual void uninstallKeyboardActions();
-  virtual void unregisterKeyboardActions();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopPaneUI)))) closeKey;
-  ::javax::swing::KeyStroke * maximizeKey;
-  ::javax::swing::KeyStroke * minimizeKey;
-  ::javax::swing::KeyStroke * navigateKey;
-  ::javax::swing::KeyStroke * navigateKey2;
-  ::javax::swing::DesktopManager * desktopManager;
-  ::javax::swing::JDesktopPane * desktop;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
deleted file mode 100644
index a9daf9bc7a2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$1__
-#define __javax_swing_plaf_basic_BasicDirectoryModel$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDirectoryModel;
-            class BasicDirectoryModel$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDirectoryModel$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDirectoryModel$1(::javax::swing::plaf::basic::BasicDirectoryModel *);
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDirectoryModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDirectoryModel$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
deleted file mode 100644
index a5d2a719d3c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
-#define __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDirectoryModel$DirectoryLoadThread;
-            class BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread *, ::java::util::List *, jint, ::java::util::List *, jint);
-public:
-  virtual void run();
-public: // actually package-private
-  virtual void cancel();
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) added;
-  jint addIndex;
-  ::java::util::List * removed;
-  jint removeIndex;
-  jboolean cancel__;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
deleted file mode 100644
index d20f830c24a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
-#define __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDirectoryModel;
-            class BasicDirectoryModel$DirectoryLoadThread;
-            class BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  BasicDirectoryModel$DirectoryLoadThread(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::io::File *);
-public:
-  virtual void run();
-private:
-  void invokeLater(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest *);
-public: // actually package-private
-  virtual void cancelPending();
-  static ::javax::swing::plaf::basic::BasicDirectoryModel * access$0(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread *);
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) directory;
-private:
-  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest * pending;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDirectoryModel * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
deleted file mode 100644
index f13550f7100..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDirectoryModel__
-#define __javax_swing_plaf_basic_BasicDirectoryModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-      namespace event
-      {
-          class ListDataEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDirectoryModel;
-            class BasicDirectoryModel$DirectoryLoadThread;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDirectoryModel : public ::javax::swing::AbstractListModel
-{
-
-public:
-  BasicDirectoryModel(::javax::swing::JFileChooser *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual void fireContentsChanged();
-  virtual ::java::util::Vector * getDirectories();
-  virtual ::java::lang::Object * getElementAt(jint);
-  virtual ::java::util::Vector * getFiles();
-  virtual jint getSize();
-  virtual jint indexOf(::java::lang::Object *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-  virtual void invalidateFileCache();
-public: // actually protected
-  virtual jboolean lt(::java::io::File *, ::java::io::File *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual jboolean renameFile(::java::io::File *, ::java::io::File *);
-public: // actually protected
-  virtual void sort(::java::util::Vector *);
-public:
-  virtual void validateFileCache();
-public: // actually package-private
-  static ::java::util::Vector * access$0(::javax::swing::plaf::basic::BasicDirectoryModel *);
-  static void access$1(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::util::Vector *);
-  static void access$2(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::util::Vector *);
-  static void access$3(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::lang::Object *, jint, jint);
-  static void access$4(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::lang::Object *, jint, jint);
-  static ::javax::swing::JFileChooser * access$5(::javax::swing::plaf::basic::BasicDirectoryModel *);
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) contents;
-  ::java::util::Vector * directories;
-  ::java::util::Vector * files;
-  jint listingMode;
-  ::javax::swing::JFileChooser * filechooser;
-  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread * loadThread;
-  ::java::util::Comparator * comparator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDirectoryModel__
diff --git a/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h b/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
deleted file mode 100644
index b0033edb185..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicEditorPaneUI__
-#define __javax_swing_plaf_basic_BasicEditorPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicEditorPaneUI;
-        }
-      }
-      namespace text
-      {
-          class EditorKit;
-          class JTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicEditorPaneUI : public ::javax::swing::plaf::basic::BasicTextUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  BasicEditorPaneUI();
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicEditorPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
deleted file mode 100644
index 72434cc649f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
-
-#pragma interface
-
-#include <javax/swing/filechooser/FileFilter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$AcceptAllFileFilter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$AcceptAllFileFilter : public ::javax::swing::filechooser::FileFilter
-{
-
-public:
-  BasicFileChooserUI$AcceptAllFileFilter(::javax::swing::plaf::basic::BasicFileChooserUI *);
-  virtual jboolean accept(::java::io::File *);
-  virtual ::java::lang::String * getDescription();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::filechooser::FileFilter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
deleted file mode 100644
index b650369befd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$ApproveSelectionAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$ApproveSelectionAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$ApproveSelectionAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
deleted file mode 100644
index dece5a2e955..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
-
-#pragma interface
-
-#include <javax/swing/filechooser/FileView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$BasicFileView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$BasicFileView : public ::javax::swing::filechooser::FileView
-{
-
-public:
-  BasicFileChooserUI$BasicFileView(::javax::swing::plaf::basic::BasicFileChooserUI *);
-  virtual void cacheIcon(::java::io::File *, ::javax::swing::Icon *);
-  virtual void clearIconCache();
-  virtual ::javax::swing::Icon * getCachedIcon(::java::io::File *);
-  virtual ::java::lang::String * getDescription(::java::io::File *);
-  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
-  virtual ::java::lang::String * getName(::java::io::File *);
-  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
-  virtual ::java::lang::Boolean * isHidden(::java::io::File *);
-public: // actually protected
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::javax::swing::filechooser::FileView)))) iconCache;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
deleted file mode 100644
index 03af702d390..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$CancelSelectionAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$CancelSelectionAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$CancelSelectionAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
deleted file mode 100644
index 75b99b56b03..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$ChangeToParentDirectoryAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$ChangeToParentDirectoryAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$ChangeToParentDirectoryAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
deleted file mode 100644
index 79df9920515..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$DoubleClickListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$DoubleClickListener : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  BasicFileChooserUI$DoubleClickListener(::javax::swing::plaf::basic::BasicFileChooserUI *, ::javax::swing::JList *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) lastSelected;
-  ::javax::swing::JList * list;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
deleted file mode 100644
index 219143eb5fb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$GoHomeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$GoHomeAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$GoHomeAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
deleted file mode 100644
index da249e43aae..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$NewFolderAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$NewFolderAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$NewFolderAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
deleted file mode 100644
index af8c2d0ba6e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$SelectionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$SelectionListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicFileChooserUI$SelectionListener(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
deleted file mode 100644
index a3db6b1345b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$UpdateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$UpdateAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$UpdateAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
deleted file mode 100644
index 8565a6757b1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
+++ /dev/null
@@ -1,187 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI__
-#define __javax_swing_plaf_basic_BasicFileChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/FileChooserUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JButton;
-        class JComponent;
-        class JFileChooser;
-        class JList;
-        class JPanel;
-        class JTextField;
-      namespace event
-      {
-          class ListSelectionListener;
-      }
-      namespace filechooser
-      {
-          class FileFilter;
-          class FileView;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicDirectoryModel;
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$ApproveSelectionAction;
-            class BasicFileChooserUI$CancelSelectionAction;
-            class BasicFileChooserUI$ChangeToParentDirectoryAction;
-            class BasicFileChooserUI$GoHomeAction;
-            class BasicFileChooserUI$NewFolderAction;
-            class BasicFileChooserUI$UpdateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI : public ::javax::swing::plaf::FileChooserUI
-{
-
-public: // actually package-private
-  virtual void closeDialog();
-public:
-  BasicFileChooserUI(::javax::swing::JFileChooser *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually package-private
-  virtual void boxEntries();
-public:
-  virtual void installComponents(::javax::swing::JFileChooser *);
-  virtual void uninstallComponents(::javax::swing::JFileChooser *);
-public: // actually protected
-  virtual void installListeners(::javax::swing::JFileChooser *);
-  virtual void uninstallListeners(::javax::swing::JFileChooser *);
-  virtual void installDefaults(::javax::swing::JFileChooser *);
-  virtual void uninstallDefaults(::javax::swing::JFileChooser *);
-  virtual void installIcons(::javax::swing::JFileChooser *);
-  virtual void uninstallIcons(::javax::swing::JFileChooser *);
-  virtual void installStrings(::javax::swing::JFileChooser *);
-  virtual void uninstallStrings(::javax::swing::JFileChooser *);
-  virtual void createModel();
-public:
-  virtual ::javax::swing::plaf::basic::BasicDirectoryModel * getModel();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getFileName();
-  virtual ::java::lang::String * getDirectoryName();
-  virtual void setFileName(::java::lang::String *);
-  virtual void setDirectoryName(::java::lang::String *);
-  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
-  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *);
-  virtual ::javax::swing::JFileChooser * getFileChooser();
-  virtual ::javax::swing::JPanel * getAccessoryPanel();
-public: // actually protected
-  virtual ::javax::swing::JButton * getApproveButton(::javax::swing::JFileChooser *);
-public:
-  virtual ::java::lang::String * getApproveButtonToolTipText(::javax::swing::JFileChooser *);
-  virtual void clearIconCache();
-  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener(::javax::swing::JFileChooser *);
-public: // actually protected
-  virtual ::java::awt::event::MouseListener * createDoubleClickListener(::javax::swing::JFileChooser *, ::javax::swing::JList *);
-  virtual jboolean isDirectorySelected();
-  virtual void setDirectorySelected(jboolean);
-  virtual ::java::io::File * getDirectory();
-  virtual void setDirectory(::java::io::File *);
-public:
-  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *);
-  virtual jint getApproveButtonMnemonic(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::Action * getNewFolderAction();
-  virtual ::javax::swing::Action * getGoHomeAction();
-  virtual ::javax::swing::Action * getChangeToParentDirectoryAction();
-  virtual ::javax::swing::Action * getApproveSelectionAction();
-  virtual ::javax::swing::Action * getCancelSelectionAction();
-  virtual ::javax::swing::Action * getUpdateAction();
-public: // actually package-private
-  static ::java::io::File * access$0(::javax::swing::plaf::basic::BasicFileChooserUI *);
-  static void access$1(::javax::swing::plaf::basic::BasicFileChooserUI *, ::java::io::File *);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::FileChooserUI)))) cancelButtonMnemonic;
-  ::java::lang::String * cancelButtonText;
-  ::java::lang::String * cancelButtonToolTipText;
-  ::javax::swing::Icon * computerIcon;
-  ::javax::swing::Icon * detailsViewIcon;
-  ::javax::swing::Icon * directoryIcon;
-  jint directoryOpenButtonMnemonic;
-  ::java::lang::String * directoryOpenButtonText;
-  ::java::lang::String * directoryOpenButtonToolTipText;
-  ::javax::swing::Icon * fileIcon;
-  ::javax::swing::Icon * floppyDriveIcon;
-  ::javax::swing::Icon * hardDriveIcon;
-  jint helpButtonMnemonic;
-  ::java::lang::String * helpButtonText;
-  ::java::lang::String * helpButtonToolTipText;
-  ::javax::swing::Icon * homeFolderIcon;
-  ::javax::swing::Icon * listViewIcon;
-  ::javax::swing::Icon * newFolderIcon;
-  jint openButtonMnemonic;
-  ::java::lang::String * openButtonText;
-  ::java::lang::String * openButtonToolTipText;
-  jint saveButtonMnemonic;
-  ::java::lang::String * saveButtonText;
-  ::java::lang::String * saveButtonToolTipText;
-  jint updateButtonMnemonic;
-  ::java::lang::String * updateButtonText;
-  ::java::lang::String * updateButtonToolTipText;
-  ::javax::swing::Icon * upFolderIcon;
-public: // actually package-private
-  ::javax::swing::JFileChooser * filechooser;
-  ::javax::swing::plaf::basic::BasicDirectoryModel * model;
-  ::javax::swing::filechooser::FileFilter * acceptAll;
-  ::javax::swing::filechooser::FileView * fv;
-  ::javax::swing::JButton * accept;
-  ::javax::swing::JPanel * accessoryPanel;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::java::lang::String * acceptAllFileFilterText;
-  ::java::lang::String * dirDescText;
-  ::java::lang::String * fileDescText;
-  jboolean dirSelected;
-  ::java::io::File * currDir;
-  ::javax::swing::JPanel * bottomPanel;
-  ::javax::swing::JPanel * closePanel;
-  ::javax::swing::JTextField * entry;
-  ::java::lang::String * parentPath;
-private:
-  ::javax::swing::plaf::basic::BasicFileChooserUI$ApproveSelectionAction * approveSelectionAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$CancelSelectionAction * cancelSelectionAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$GoHomeAction * goHomeAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$ChangeToParentDirectoryAction * changeToParentDirectoryAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$NewFolderAction * newFolderAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$UpdateAction * updateAction;
-  ::java::io::File * selectedDir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h b/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
deleted file mode 100644
index f024fbb63d9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
-#define __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicFormattedTextFieldUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFormattedTextFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
-{
-
-public:
-  BasicFormattedTextFieldUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
deleted file mode 100644
index 5cab989ac60..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicGraphicsUtils__
-#define __javax_swing_plaf_basic_BasicGraphicsUtils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicGraphicsUtils;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicGraphicsUtils : public ::java::lang::Object
-{
-
-public:
-  BasicGraphicsUtils();
-  static void drawEtchedRect(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  static ::java::awt::Insets * getEtchedInsets();
-  static void drawGroove(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
-  static ::java::awt::Insets * getGrooveInsets();
-  static void drawBezel(::java::awt::Graphics *, jint, jint, jint, jint, jboolean, jboolean, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  static void drawLoweredBezel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  static void drawString(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-  static void drawStringUnderlineCharAt(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-public: // actually package-private
-  static void drawString(::javax::swing::JComponent *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-  static void drawStringUnderlineCharAt(::javax::swing::JComponent *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-public:
-  static void drawDashedRect(::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::awt::Dimension * getPreferredButtonSize(::javax::swing::AbstractButton *, jint);
-public: // actually package-private
-  static ::java::lang::String * CACHED_TEXT_LAYOUT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicGraphicsUtils__
diff --git a/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h b/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
deleted file mode 100644
index 368ab871540..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
-#define __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicHTML$HTMLRootView;
-        }
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class EditorKit;
-          class Element;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicHTML$HTMLRootView : public ::javax::swing::text::View
-{
-
-public:
-  BasicHTML$HTMLRootView(::javax::swing::JComponent *, ::javax::swing::text::View *, ::javax::swing::text::EditorKit *, ::javax::swing::text::Document *);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  virtual void setView(::javax::swing::text::View *);
-  virtual void setSize(jfloat, jfloat);
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual jint getViewCount();
-  virtual ::java::awt::Container * getContainer();
-  virtual jfloat getPreferredSpan(jint);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual ::javax::swing::text::Element * getElement();
-private:
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) view;
-  ::javax::swing::JComponent * component;
-  ::javax::swing::text::EditorKit * editorKit;
-  ::javax::swing::text::Document * document;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
diff --git a/libjava/javax/swing/plaf/basic/BasicHTML.h b/libjava/javax/swing/plaf/basic/BasicHTML.h
deleted file mode 100644
index 7ae85956eca..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicHTML.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicHTML__
-#define __javax_swing_plaf_basic_BasicHTML__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicHTML;
-        }
-      }
-      namespace text
-      {
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicHTML : public ::java::lang::Object
-{
-
-public:
-  BasicHTML();
-  static ::javax::swing::text::View * createHTMLView(::javax::swing::JComponent *, ::java::lang::String *);
-  static jboolean isHTMLString(::java::lang::String *);
-  static void updateRenderer(::javax::swing::JComponent *, ::java::lang::String *);
-  static ::java::lang::String * propertyKey;
-  static ::java::lang::String * documentBaseKey;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicHTML__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
deleted file mode 100644
index f15f5b9c4b7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$1__
-#define __javax_swing_plaf_basic_BasicIconFactory$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$1();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
deleted file mode 100644
index 4b97c6d5e4a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$2__
-#define __javax_swing_plaf_basic_BasicIconFactory$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$2();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
deleted file mode 100644
index 0287f1c7acb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
-#define __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$CheckBoxIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$CheckBoxIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$CheckBoxIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
deleted file mode 100644
index 9c1d7f0262e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
-#define __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$CheckBoxMenuItemIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$CheckBoxMenuItemIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$CheckBoxMenuItemIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
deleted file mode 100644
index d7771903215..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
-#define __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$DummyIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$DummyIcon : public ::java::lang::Object
-{
-
-  BasicIconFactory$DummyIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  BasicIconFactory$DummyIcon(::javax::swing::plaf::basic::BasicIconFactory$DummyIcon *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
deleted file mode 100644
index a30f4d0d4a9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
-#define __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$RadioButtonIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$RadioButtonIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$RadioButtonIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory.h b/libjava/javax/swing/plaf/basic/BasicIconFactory.h
deleted file mode 100644
index fc851373dda..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory__
-#define __javax_swing_plaf_basic_BasicIconFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory;
-            class BasicIconFactory$CheckBoxIcon;
-            class BasicIconFactory$RadioButtonIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory : public ::java::lang::Object
-{
-
-public:
-  BasicIconFactory();
-  static ::javax::swing::Icon * getMenuItemCheckIcon();
-  static ::javax::swing::Icon * getMenuItemArrowIcon();
-  static ::javax::swing::Icon * getMenuArrowIcon();
-  static ::javax::swing::Icon * getCheckBoxIcon();
-  static ::javax::swing::Icon * getRadioButtonIcon();
-  static ::javax::swing::Icon * getCheckBoxMenuItemIcon();
-  static ::javax::swing::Icon * getRadioButtonMenuItemIcon();
-  static ::javax::swing::Icon * createEmptyFrameIcon();
-public: // actually package-private
-  static const jlong serialVersionUID = 5605588811185324383LL;
-private:
-  static ::javax::swing::plaf::basic::BasicIconFactory$CheckBoxIcon * checkBoxIcon;
-  static ::javax::swing::plaf::basic::BasicIconFactory$RadioButtonIcon * radioButtonIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
deleted file mode 100644
index efce70e9db2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$CloseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$CloseAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$CloseAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
deleted file mode 100644
index 4ed9a7f741f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$IconifyAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$IconifyAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$IconifyAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
deleted file mode 100644
index cf31b3c0d10..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$MaximizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$MaximizeAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$MaximizeAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
deleted file mode 100644
index 6c4570f1f9c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$MoveAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$MoveAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$MoveAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
deleted file mode 100644
index 3177afec5c7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$PaneButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$PaneButton : public ::javax::swing::JButton
-{
-
-public:
-  BasicInternalFrameTitlePane$PaneButton(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *, ::javax::swing::Action *);
-  virtual jboolean isFocusable();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
deleted file mode 100644
index be7bb8be66f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicInternalFrameTitlePane$PropertyChangeHandler(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
deleted file mode 100644
index b33c5e0cda1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$RestoreAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$RestoreAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$RestoreAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
deleted file mode 100644
index edf1553f8d3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$SizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$SizeAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$SizeAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
deleted file mode 100644
index 9510859b96a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
-
-#pragma interface
-
-#include <javax/swing/JMenuBar.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$SystemMenuBar;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$SystemMenuBar : public ::javax::swing::JMenuBar
-{
-
-public:
-  BasicInternalFrameTitlePane$SystemMenuBar(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isOpaque();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void requestFocus();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JMenuBar)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
deleted file mode 100644
index 4dedb42bd2c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$TitlePaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$TitlePaneLayout : public ::java::lang::Object
-{
-
-public:
-  BasicInternalFrameTitlePane$TitlePaneLayout(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
deleted file mode 100644
index 68b826b2f97..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class FontMetrics;
-        class Graphics;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JButton;
-        class JInternalFrame;
-        class JLabel;
-        class JMenu;
-        class JMenuBar;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane : public ::javax::swing::JComponent
-{
-
-public:
-  BasicInternalFrameTitlePane(::javax::swing::JInternalFrame *);
-public: // actually protected
-  virtual void installTitlePane();
-  virtual void addSubComponents();
-  virtual void createActions();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void createButtons();
-  virtual void setButtonIcons();
-  virtual void assembleSystemMenu();
-  virtual void addSystemMenuItems(::javax::swing::JMenu *);
-  virtual ::javax::swing::JMenuBar * createSystemMenuBar();
-  virtual ::javax::swing::JMenu * createSystemMenu();
-  virtual void showSystemMenu();
-public:
-  virtual void paintComponent(::java::awt::Graphics *);
-public: // actually protected
-  virtual void paintTitleBackground(::java::awt::Graphics *);
-  virtual ::java::lang::String * getTitle(::java::lang::String *, ::java::awt::FontMetrics *, jint);
-  virtual void postClosingEvent(::javax::swing::JInternalFrame *);
-  virtual void enableActions();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::LayoutManager * createLayout();
-  static ::java::lang::String * CLOSE_CMD;
-  static ::java::lang::String * ICONIFY_CMD;
-  static ::java::lang::String * MAXIMIZE_CMD;
-  static ::java::lang::String * MOVE_CMD;
-  static ::java::lang::String * RESTORE_CMD;
-  static ::java::lang::String * SIZE_CMD;
-  ::javax::swing::Action * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) closeAction;
-  ::javax::swing::Action * iconifyAction;
-  ::javax::swing::Action * maximizeAction;
-  ::javax::swing::Action * moveAction;
-  ::javax::swing::Action * restoreAction;
-  ::javax::swing::Action * sizeAction;
-  ::javax::swing::JButton * closeButton;
-  ::javax::swing::JButton * iconButton;
-  ::javax::swing::JButton * maxButton;
-  ::javax::swing::Icon * minIcon;
-  ::javax::swing::Icon * maxIcon;
-  ::javax::swing::Icon * iconIcon;
-  ::javax::swing::Icon * closeIcon;
-  ::javax::swing::JInternalFrame * frame;
-  ::javax::swing::JMenuBar * menuBar;
-  ::javax::swing::JMenu * windowMenu;
-  ::java::awt::Color * notSelectedTextColor;
-  ::java::awt::Color * notSelectedTitleColor;
-  ::java::awt::Color * selectedTextColor;
-  ::java::awt::Color * selectedTitleColor;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public: // actually package-private
-  ::javax::swing::JLabel * title;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
deleted file mode 100644
index d1d36649a61..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class InternalFrameEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$BasicInternalFrameListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$BasicInternalFrameListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicInternalFrameUI$BasicInternalFrameListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
deleted file mode 100644
index 18a50e63a35..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
-
-#pragma interface
-
-#include <javax/swing/event/MouseInputAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$BorderListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$BorderListener : public ::javax::swing::event::MouseInputAdapter
-{
-
-public: // actually protected
-  BasicInternalFrameUI$BorderListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void setCursor(::java::awt::event::MouseEvent *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-private:
-  jint sectionOfClick(jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) showingCursor;
-public: // actually protected
-  const jint RESIZE_NONE;
-private:
-  jint xOffset;
-  jint yOffset;
-  jint direction;
-  ::java::awt::Rectangle * cacheRect;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
deleted file mode 100644
index aeedc9352f0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$ComponentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$ComponentHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicInternalFrameUI$ComponentHandler(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
deleted file mode 100644
index 24529023260..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$GlassPaneDispatcher;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$GlassPaneDispatcher : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicInternalFrameUI$GlassPaneDispatcher(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-private:
-  void handleEvent(::java::awt::event::MouseEvent *);
-  void redispatch(jint, ::java::awt::event::MouseEvent *, ::java::awt::Component *);
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mouseEventTarget;
-  ::java::awt::Component * dragTarget;
-  jboolean isDragging;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
deleted file mode 100644
index a5ddab06727..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$InternalFrameBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFrameBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public: // actually package-private
-  BasicInternalFrameUI$InternalFrameBorder(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual jboolean isBorderOpaque();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually package-private
-  static const jint bSize = 5;
-  static const jint cornerSize = 10;
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
deleted file mode 100644
index 6ff8ae9abf5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$InternalFrameLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFrameLayout : public ::java::lang::Object
-{
-
-public:
-  BasicInternalFrameUI$InternalFrameLayout(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-private:
-  ::java::awt::Dimension * getSize(::java::awt::Container *, jboolean);
-public:
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
deleted file mode 100644
index c1a37ba0d18..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$InternalFramePropertyChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFramePropertyChangeListener : public ::java::lang::Object
-{
-
-public:
-  BasicInternalFrameUI$InternalFramePropertyChangeListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
deleted file mode 100644
index 9b43d26dfdf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$ShowSystemMenuAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$ShowSystemMenuAction : public ::javax::swing::AbstractAction
-{
-
-  BasicInternalFrameUI$ShowSystemMenuAction(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  BasicInternalFrameUI$ShowSystemMenuAction(::javax::swing::plaf::basic::BasicInternalFrameUI *, ::javax::swing::plaf::basic::BasicInternalFrameUI$ShowSystemMenuAction *);
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
deleted file mode 100644
index 18aa9207e30..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/InternalFrameUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class LayoutManager;
-      namespace event
-      {
-          class ComponentListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DesktopManager;
-        class JComponent;
-        class JDesktopPane;
-        class JInternalFrame;
-        class KeyStroke;
-      namespace event
-      {
-          class MouseInputAdapter;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$BasicInternalFrameListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI : public ::javax::swing::plaf::InternalFrameUI
-{
-
-public:
-  BasicInternalFrameUI(::javax::swing::JInternalFrame *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void installComponents();
-  virtual void installListeners();
-  virtual void uninstallDefaults();
-  virtual void uninstallComponents();
-  virtual void uninstallListeners();
-  virtual void uninstallKeyboardActions();
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void replacePane(::javax::swing::JComponent *, ::javax::swing::JComponent *);
-  virtual void deinstallMouseHandlers(::javax::swing::JComponent *);
-  virtual void installMouseHandlers(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * createNorthPane(::javax::swing::JInternalFrame *);
-  virtual ::javax::swing::JComponent * createWestPane(::javax::swing::JInternalFrame *);
-  virtual ::javax::swing::JComponent * createSouthPane(::javax::swing::JInternalFrame *);
-  virtual ::javax::swing::JComponent * createEastPane(::javax::swing::JInternalFrame *);
-  virtual ::javax::swing::event::MouseInputAdapter * createBorderListener(::javax::swing::JInternalFrame *);
-  virtual void createInternalFrameListener();
-  virtual jboolean isKeyBindingRegistered();
-  virtual void setKeyBindingRegistered(jboolean);
-public:
-  virtual jboolean isKeyBindingActive();
-public: // actually protected
-  virtual void setKeyBindingActive(jboolean);
-  virtual void setupMenuOpenKey();
-  virtual void setupMenuCloseKey();
-public:
-  virtual ::javax::swing::JComponent * getNorthPane();
-  virtual void setNorthPane(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * getSouthPane();
-  virtual void setSouthPane(::javax::swing::JComponent *);
-  virtual void setEastPane(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * getEastPane();
-  virtual void setWestPane(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * getWestPane();
-public: // actually protected
-  virtual ::javax::swing::DesktopManager * getDesktopManager();
-  virtual ::javax::swing::DesktopManager * createDesktopManager();
-  virtual void closeFrame(::javax::swing::JInternalFrame *);
-  virtual void maximizeFrame(::javax::swing::JInternalFrame *);
-  virtual void minimizeFrame(::javax::swing::JInternalFrame *);
-  virtual void iconifyFrame(::javax::swing::JInternalFrame *);
-  virtual void deiconifyFrame(::javax::swing::JInternalFrame *);
-  virtual void activateFrame(::javax::swing::JInternalFrame *);
-  virtual void deactivateFrame(::javax::swing::JInternalFrame *);
-  virtual ::java::awt::event::ComponentListener * createComponentListener();
-  virtual ::javax::swing::event::MouseInputListener * createGlassPaneDispatcher();
-  ::javax::swing::event::MouseInputAdapter * __attribute__((aligned(__alignof__( ::javax::swing::plaf::InternalFrameUI)))) borderListener;
-  ::java::awt::event::ComponentListener * componentListener;
-  ::javax::swing::event::MouseInputListener * glassPaneDispatcher;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-private:
-  ::javax::swing::plaf::basic::BasicInternalFrameUI$BasicInternalFrameListener * internalFrameListener;
-public: // actually protected
-  ::javax::swing::JComponent * eastPane;
-  ::javax::swing::JComponent * northPane;
-  ::javax::swing::JComponent * southPane;
-  ::javax::swing::JComponent * westPane;
-  ::javax::swing::KeyStroke * openMenuKey;
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * titlePane;
-  ::javax::swing::JInternalFrame * frame;
-  ::java::awt::LayoutManager * internalFrameLayout;
-private:
-  ::javax::swing::JDesktopPane * desktopPane;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h b/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
deleted file mode 100644
index e3004516f65..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLabelUI$1__
-#define __javax_swing_plaf_basic_BasicLabelUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLabelUI;
-            class BasicLabelUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLabelUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicLabelUI$1(::javax::swing::plaf::basic::BasicLabelUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLabelUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLabelUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.h b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
deleted file mode 100644
index 5c67114230e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLabelUI__
-#define __javax_swing_plaf_basic_BasicLabelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/LabelUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class FontMetrics;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JLabel;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicLabelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLabelUI : public ::javax::swing::plaf::LabelUI
-{
-
-public:
-  BasicLabelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * layoutCL(::javax::swing::JLabel *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  virtual void paintDisabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
-  virtual void paintEnabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installComponents(::javax::swing::JLabel *);
-  virtual void uninstallComponents(::javax::swing::JLabel *);
-  virtual void installDefaults(::javax::swing::JLabel *);
-  virtual void uninstallDefaults(::javax::swing::JLabel *);
-  virtual void installKeyboardActions(::javax::swing::JLabel *);
-  virtual void uninstallKeyboardActions(::javax::swing::JLabel *);
-  virtual void installListeners(::javax::swing::JLabel *);
-  virtual void uninstallListeners(::javax::swing::JLabel *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-private:
-  ::java::awt::FontMetrics * getFontMetrics(::javax::swing::JLabel *);
-public: // actually protected
-  static ::javax::swing::plaf::basic::BasicLabelUI * labelUI;
-private:
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) vr;
-  ::java::awt::Rectangle * ir;
-  ::java::awt::Rectangle * tr;
-  ::java::awt::Insets * cachedInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLabelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h b/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
deleted file mode 100644
index 48cfc19f080..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
-#define __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI$ActionListenerProxy;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$ActionListenerProxy : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicListUI$ActionListenerProxy(::java::awt::event::ActionListener *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::java::awt::event::ActionListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) target;
-  ::java::lang::String * bindingCommandName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
deleted file mode 100644
index a79c2a9fb77..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicListUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$FocusHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually protected
-  virtual void repaintCellFocus();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
deleted file mode 100644
index 0cec9aa6e6f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$ListAction__
-#define __javax_swing_plaf_basic_BasicListUI$ListAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$ListAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$ListAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicListUI$ListAction(::javax::swing::plaf::basic::BasicListUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$ListAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
deleted file mode 100644
index f0c6a1579aa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
-#define __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$ListDataHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$ListDataHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$ListDataHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
deleted file mode 100644
index 8211c698210..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
-#define __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$ListSelectionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$ListSelectionHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$ListSelectionHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
deleted file mode 100644
index deb7b583233..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$MouseInputHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
deleted file mode 100644
index 8993d1b387b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI.h b/libjava/javax/swing/plaf/basic/BasicListUI.h
deleted file mode 100644
index 2d0d79d84d0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI__
-#define __javax_swing_plaf_basic_BasicListUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ListUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class CellRendererPane;
-        class JComponent;
-        class JList;
-        class ListCellRenderer;
-        class ListModel;
-        class ListSelectionModel;
-      namespace event
-      {
-          class ListDataListener;
-          class ListSelectionListener;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$ListAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI : public ::javax::swing::plaf::ListUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jint getRowHeight(jint);
-public:
-  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint);
-private:
-  jint getCellHeight(jint);
-public: // actually protected
-  virtual jint convertRowToY(jint);
-  virtual jint convertYToRow(jint);
-  virtual void updateLayoutState();
-  virtual void maybeUpdateLayoutState();
-public:
-  BasicListUI();
-public: // actually protected
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintCell(::java::awt::Graphics *, jint, ::java::awt::Rectangle *, ::javax::swing::ListCellRenderer *, ::javax::swing::ListModel *, ::javax::swing::ListSelectionModel *, jint);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *);
-  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint);
-public: // actually protected
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::javax::swing::event::ListDataListener * createListDataListener();
-  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener();
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void selectNextIndex();
-  virtual void selectPreviousIndex();
-  static const jint modelChanged = 1;
-  static const jint selectionModelChanged = 2;
-  static const jint fontChanged = 4;
-  static const jint fixedCellWidthChanged = 8;
-  static const jint fixedCellHeightChanged = 16;
-  static const jint prototypeCellValueChanged = 32;
-  static const jint cellRendererChanged = 64;
-  ::java::awt::event::FocusListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ListUI)))) focusListener;
-  ::javax::swing::event::ListDataListener * listDataListener;
-  ::javax::swing::event::ListSelectionListener * listSelectionListener;
-  ::javax::swing::event::MouseInputListener * mouseInputListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::JList * list;
-  jint cellHeight;
-  jint cellWidth;
-  JArray< jint > * cellHeights;
-  jint updateLayoutStateNeeded;
-  ::javax::swing::CellRendererPane * rendererPane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI$ListAction * action;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
deleted file mode 100644
index 19b3df51170..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$1__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$1(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
deleted file mode 100644
index 4abad0388ea..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$2__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$2(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
deleted file mode 100644
index 9067d731eeb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$3__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$3(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
deleted file mode 100644
index b92945c84ff..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$4__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$4(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
deleted file mode 100644
index f87f80e01e0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$5__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$5__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$5 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$5(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
deleted file mode 100644
index 9271f9643b2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$6__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$6__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$6 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$6(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
deleted file mode 100644
index 9b78750c041..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$7__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$7__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$7;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$7 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$7(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
deleted file mode 100644
index 0227ab30e5e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$AudioAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$AudioAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicLookAndFeel$AudioAction(::javax::swing::plaf::basic::BasicLookAndFeel *, ::java::lang::Object *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) key;
-  ::javax::swing::plaf::basic::BasicLookAndFeel * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
deleted file mode 100644
index 03118997e46..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$PopupHelper;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper : public ::java::lang::Object
-{
-
-  BasicLookAndFeel$PopupHelper(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual void eventDispatched(::java::awt::AWTEvent *);
-private:
-  void mousePressed(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  BasicLookAndFeel$PopupHelper(::javax::swing::plaf::basic::BasicLookAndFeel *, ::javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper *);
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
deleted file mode 100644
index 13b4adac44a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel__
-#define __javax_swing_plaf_basic_BasicLookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/LookAndFeel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class ActionMap;
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$PopupHelper;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel : public ::javax::swing::LookAndFeel
-{
-
-public:
-  BasicLookAndFeel();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-public: // actually protected
-  virtual void initClassDefaults(::javax::swing::UIDefaults *);
-  virtual void initSystemColorDefaults(::javax::swing::UIDefaults *);
-  virtual void loadSystemColors(::javax::swing::UIDefaults *, JArray< ::java::lang::String * > *, jboolean);
-private:
-  void loadResourceBundle(::javax::swing::UIDefaults *);
-public: // actually protected
-  virtual void initComponentDefaults(::javax::swing::UIDefaults *);
-  virtual ::javax::swing::ActionMap * getAudioActionMap();
-  virtual ::javax::swing::Action * createAudioAction(::java::lang::Object *);
-  virtual void playSound(::javax::swing::Action *);
-public:
-  virtual void initialize();
-  virtual void uninitialize();
-public: // actually package-private
-  static const jlong serialVersionUID = -6096995660290287879LL;
-  static ::java::lang::String * DONT_CANCEL_POPUP;
-private:
-  ::javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper * __attribute__((aligned(__alignof__( ::javax::swing::LookAndFeel)))) popupHelper;
-  ::javax::swing::ActionMap * audioActionMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
deleted file mode 100644
index 106c4d95b7d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI;
-            class BasicMenuBarUI$ChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$ChangeHandler : public ::java::lang::Object
-{
-
-  BasicMenuBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  BasicMenuBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$ChangeHandler *);
-  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
deleted file mode 100644
index fe9e6810ab0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI;
-            class BasicMenuBarUI$ContainerHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$ContainerHandler : public ::java::lang::Object
-{
-
-  BasicMenuBarUI$ContainerHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  BasicMenuBarUI$ContainerHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$ContainerHandler *);
-  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
deleted file mode 100644
index b1882e190cc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI$FocusAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$FocusAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicMenuBarUI$FocusAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
deleted file mode 100644
index 80b279360c4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI;
-            class BasicMenuBarUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$MouseInputHandler : public ::java::lang::Object
-{
-
-  BasicMenuBarUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  BasicMenuBarUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$MouseInputHandler *);
-  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
deleted file mode 100644
index 0365962d28a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI;
-            class BasicMenuBarUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicMenuBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicMenuBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
deleted file mode 100644
index 27b85de909a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI__
-#define __javax_swing_plaf_basic_BasicMenuBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/MenuBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class ContainerListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class JComponent;
-        class JMenuBar;
-      namespace event
-      {
-          class ChangeListener;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicMenuBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI : public ::javax::swing::plaf::MenuBarUI
-{
-
-public:
-  BasicMenuBarUI();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-  virtual ::java::awt::event::ContainerListener * createContainerListener();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public: // actually protected
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuBarUI)))) changeListener;
-  ::java::awt::event::ContainerListener * containerListener;
-private:
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public: // actually protected
-  ::javax::swing::JMenuBar * menuBar;
-private:
-  ::javax::swing::event::MouseInputListener * mouseListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
deleted file mode 100644
index ffdf9672aaa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$ClickAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$ClickAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicMenuItemUI$ClickAction(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
deleted file mode 100644
index f2746bf14c3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$ItemHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$ItemHandler : public ::java::lang::Object
-{
-
-  BasicMenuItemUI$ItemHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  BasicMenuItemUI$ItemHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$ItemHandler *);
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
deleted file mode 100644
index 775a4f78ca1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuDragMouseEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$MenuDragMouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$MenuDragMouseHandler : public ::java::lang::Object
-{
-
-  BasicMenuItemUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
-public: // actually package-private
-  BasicMenuItemUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$MenuDragMouseHandler *);
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
deleted file mode 100644
index db70c21c631..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuKeyEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$MenuKeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$MenuKeyHandler : public ::java::lang::Object
-{
-
-  BasicMenuItemUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *);
-  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *);
-  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *);
-public: // actually package-private
-  BasicMenuItemUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$MenuKeyHandler *);
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
deleted file mode 100644
index 6f735f39320..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicMenuItemUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
deleted file mode 100644
index 203bd657685..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicMenuItemUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
deleted file mode 100644
index c602c23106e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI__
-#define __javax_swing_plaf_basic_BasicMenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/MenuItemUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Font;
-        class Graphics;
-        class Rectangle;
-      namespace event
-      {
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JMenuItem;
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class MenuDragMouseListener;
-          class MenuKeyListener;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI : public ::javax::swing::plaf::MenuItemUI
-{
-
-public:
-  BasicMenuItemUI();
-public: // actually protected
-  virtual ::javax::swing::event::MenuDragMouseListener * createMenuDragMouseListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MenuKeyListener * createMenuKeyListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener(::javax::swing::JComponent *);
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void doClick(::javax::swing::MenuSelectionManager *);
-public:
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::MenuElement * > * getPath();
-public: // actually protected
-  virtual ::java::awt::Dimension * getPreferredMenuItemSize(::javax::swing::JComponent *, ::javax::swing::Icon *, ::javax::swing::Icon *, jint);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-  virtual void installComponents(::javax::swing::JMenuItem *);
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintBackground(::java::awt::Graphics *, ::javax::swing::JMenuItem *, ::java::awt::Color *);
-  virtual void paintMenuItem(::java::awt::Graphics *, ::javax::swing::JComponent *, ::javax::swing::Icon *, ::javax::swing::Icon *, ::java::awt::Color *, ::java::awt::Color *, jint);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JMenuItem *, ::java::awt::Rectangle *, ::java::lang::String *);
-  virtual void uninstallComponents(::javax::swing::JMenuItem *);
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  ::java::lang::String * getAcceleratorString(::javax::swing::JMenuItem *);
-  void resetRectangles(::javax::swing::JMenuItem *);
-  void layoutMenuItem(::javax::swing::JMenuItem *, ::java::lang::String *);
-public: // actually protected
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuItemUI)))) acceleratorFont;
-  ::java::awt::Color * acceleratorForeground;
-  ::java::awt::Color * acceleratorSelectionForeground;
-  ::javax::swing::Icon * arrowIcon;
-  ::javax::swing::Icon * checkIcon;
-  jint defaultTextIconGap;
-  ::java::awt::Color * disabledForeground;
-  ::javax::swing::event::MenuDragMouseListener * menuDragMouseListener;
-  ::javax::swing::JMenuItem * menuItem;
-  ::javax::swing::event::MenuKeyListener * menuKeyListener;
-  ::javax::swing::event::MouseInputListener * mouseInputListener;
-  jboolean oldBorderPainted;
-  ::java::awt::Color * selectionBackground;
-  ::java::awt::Color * selectionForeground;
-private:
-  ::java::lang::String * acceleratorDelimiter;
-  ::java::awt::event::ItemListener * itemListener;
-  ::javax::swing::plaf::basic::BasicMenuItemUI$PropertyChangeHandler * propertyChangeListener;
-  ::java::awt::Rectangle * viewRect;
-  ::java::awt::Rectangle * textRect;
-  ::java::awt::Rectangle * accelRect;
-  ::java::awt::Rectangle * iconRect;
-  ::java::awt::Rectangle * arrowIconRect;
-  ::java::awt::Rectangle * checkIconRect;
-  ::java::awt::Rectangle * cachedRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
deleted file mode 100644
index 44eeca1219c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenu;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$ChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$ChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicMenuUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::JMenu *, ::javax::swing::plaf::basic::BasicMenuUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isSelected;
-  ::javax::swing::JMenu * menu;
-  ::javax::swing::plaf::basic::BasicMenuUI * ui;
-  ::java::awt::Component * wasFocused;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
deleted file mode 100644
index 39cc8f9f8c6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuDragMouseEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$MenuDragMouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$MenuDragMouseHandler : public ::java::lang::Object
-{
-
-  BasicMenuUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
-public: // actually package-private
-  BasicMenuUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuDragMouseHandler *);
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
deleted file mode 100644
index eb519164dae..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$MenuHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$MenuHandler : public ::java::lang::Object
-{
-
-  BasicMenuUI$MenuHandler(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void menuCanceled(::javax::swing::event::MenuEvent *);
-  virtual void menuDeselected(::javax::swing::event::MenuEvent *);
-  virtual void menuSelected(::javax::swing::event::MenuEvent *);
-public: // actually package-private
-  BasicMenuUI$MenuHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuHandler *);
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
deleted file mode 100644
index be2f9ca155d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuKeyEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$MenuKeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$MenuKeyHandler : public ::java::lang::Object
-{
-
-  BasicMenuUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *);
-  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *);
-  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *);
-public: // actually package-private
-  BasicMenuUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuKeyHandler *);
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
deleted file mode 100644
index c5e1e4064dd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicMenuUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-private:
-  jboolean popupVisible();
-public:
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
deleted file mode 100644
index 97815775285..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
-#define __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$SelectMenuAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$SelectMenuAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicMenuUI$SelectMenuAction(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI.h b/libjava/javax/swing/plaf/basic/BasicMenuUI.h
deleted file mode 100644
index d3ae59e3592..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI__
-#define __javax_swing_plaf_basic_BasicMenuUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JMenu;
-      namespace event
-      {
-          class ChangeListener;
-          class MenuDragMouseListener;
-          class MenuKeyListener;
-          class MenuListener;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicMenuUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
-{
-
-public:
-  BasicMenuUI();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MenuDragMouseListener * createMenuDragMouseListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MenuKeyListener * createMenuKeyListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MenuListener * createMenuListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener(::javax::swing::JComponent *);
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JComponent *);
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void installListeners();
-  virtual void setupPostTimer(::javax::swing::JMenu *);
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicMenuItemUI)))) changeListener;
-  ::javax::swing::event::MenuListener * menuListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
deleted file mode 100644
index 644bb97c24c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$1__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$1__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$1 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$1();
-public:
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
deleted file mode 100644
index 81a3757327d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$2__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$2__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$2 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$2();
-public:
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
deleted file mode 100644
index febfc6bde93..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$3__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$3__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$3 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$3();
-public:
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
deleted file mode 100644
index 313bc76e5fa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$4__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$4__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$4 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$4();
-public:
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
deleted file mode 100644
index 575b2b79c74..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI;
-            class BasicOptionPaneUI$ButtonActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$ButtonActionListener : public ::java::lang::Object
-{
-
-public:
-  BasicOptionPaneUI$ButtonActionListener(::javax::swing::plaf::basic::BasicOptionPaneUI *, jint);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) buttonIndex;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicOptionPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
deleted file mode 100644
index 06671ddd4fa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$ButtonAreaLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$ButtonAreaLayout : public ::java::lang::Object
-{
-
-public:
-  BasicOptionPaneUI$ButtonAreaLayout(jboolean, jint);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual jboolean getCentersChildren();
-  virtual jint getPadding();
-  virtual jboolean getSyncAllWidths();
-  virtual void layoutContainer(::java::awt::Container *);
-private:
-  jint buttonRowLength(::java::awt::Container *);
-public:
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void setCentersChildren(jboolean);
-  virtual void setPadding(jint);
-  virtual void setSyncAllWidths(jboolean);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) centersChildren;
-  jint padding;
-  jboolean syncAllWidths;
-private:
-  jint widthOfWidestButton;
-  jint tallestButton;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
deleted file mode 100644
index a820f3cbe25..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$MessageIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon : public ::java::lang::Object
-{
-
-  BasicOptionPaneUI$MessageIcon();
-public:
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  BasicOptionPaneUI$MessageIcon(::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
deleted file mode 100644
index 81dcc99f3e9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$OptionPaneCloseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$OptionPaneCloseAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$OptionPaneCloseAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
deleted file mode 100644
index 02b236c47a6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI;
-            class BasicOptionPaneUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicOptionPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicOptionPaneUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicOptionPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
deleted file mode 100644
index 50aa3b4ee65..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/OptionPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class GridBagConstraints;
-        class LayoutManager;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class Icon;
-        class JComponent;
-        class JLabel;
-        class JOptionPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicOptionPaneUI;
-            class BasicOptionPaneUI$MessageIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI : public ::javax::swing::plaf::OptionPaneUI
-{
-
-public:
-  BasicOptionPaneUI();
-public: // actually protected
-  virtual void addButtonComponents(::java::awt::Container *, JArray< ::java::lang::Object * > *, jint);
-  virtual void addIcon(::java::awt::Container *);
-private:
-  static ::java::awt::GridBagConstraints * createConstraints();
-public: // actually protected
-  virtual void addMessageComponents(::java::awt::Container *, ::java::awt::GridBagConstraints *, ::java::lang::Object *, jint, jboolean);
-  virtual void burstStringInto(::java::awt::Container *, ::java::lang::String *, jint);
-public:
-  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *);
-public: // actually protected
-  virtual ::java::awt::event::ActionListener * createButtonActionListener(jint);
-  virtual ::java::awt::Container * createButtonArea();
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual ::java::awt::Container * createMessageArea();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::Container * createSeparator();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual JArray< ::java::lang::Object * > * getButtons();
-  virtual ::javax::swing::Icon * getIcon();
-  virtual ::javax::swing::Icon * getIconForType(jint);
-  virtual jint getInitialValueIndex();
-  virtual jint getMaxCharactersPerLineCount();
-public:
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::Object * getMessage();
-public:
-  virtual ::java::awt::Dimension * getMinimumOptionPaneSize();
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jboolean getSizeButtonsToSameWidth();
-  virtual void installComponents();
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public: // actually protected
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void resetInputValue();
-public:
-  virtual void selectInitialValue(::javax::swing::JOptionPane *);
-public: // actually package-private
-  virtual void resetSelectedValue();
-public: // actually protected
-  virtual void uninstallComponents();
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-private:
-  void configureLabel(::javax::swing::JLabel *);
-public:
-  static const jint MinimumWidth = 262;
-  static const jint MinimumHeight = 90;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::OptionPaneUI)))) hasCustomComponents;
-  ::java::awt::Component * initialFocusComponent;
-  ::javax::swing::JComponent * inputComponent;
-  ::java::awt::Dimension * minimumSize;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::JOptionPane * optionPane;
-private:
-  static const jint ICON_SIZE = 36;
-  static ::java::lang::String * OK_STRING;
-  static ::java::lang::String * YES_STRING;
-  static ::java::lang::String * NO_STRING;
-  static ::java::lang::String * CANCEL_STRING;
-public: // actually package-private
-  ::java::awt::Container * messageAreaContainer;
-  ::java::awt::Container * buttonContainer;
-private:
-  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * errorIcon;
-  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * infoIcon;
-  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * warningIcon;
-  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * questionIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPanelUI.h b/libjava/javax/swing/plaf/basic/BasicPanelUI.h
deleted file mode 100644
index 5fcf6fe892a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPanelUI.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPanelUI__
-#define __javax_swing_plaf_basic_BasicPanelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/PanelUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JPanel;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicPanelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPanelUI : public ::javax::swing::plaf::PanelUI
-{
-
-public:
-  BasicPanelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JPanel *);
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults(::javax::swing::JPanel *);
-public: // actually package-private
-  static ::javax::swing::plaf::basic::BasicPanelUI * sharedUI;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPanelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h b/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
deleted file mode 100644
index fcbb8732fa3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPasswordFieldUI__
-#define __javax_swing_plaf_basic_BasicPasswordFieldUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicPasswordFieldUI;
-        }
-      }
-      namespace text
-      {
-          class Element;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPasswordFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
-{
-
-public:
-  BasicPasswordFieldUI();
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPasswordFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
deleted file mode 100644
index d5082f9d18e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
-#define __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicPopupMenuSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
-{
-
-public:
-  BasicPopupMenuSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
deleted file mode 100644
index 5fb04078aea..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class JRootPane;
-        class MenuElement;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicPopupMenuUI;
-            class BasicPopupMenuUI$KeyboardHelper;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper : public ::java::lang::Object
-{
-
-  BasicPopupMenuUI$KeyboardHelper(::javax::swing::plaf::basic::BasicPopupMenuUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-private:
-  ::javax::swing::JPopupMenu * getActivePopup(JArray< ::javax::swing::MenuElement * > *);
-  jboolean invokerEquals(::javax::swing::MenuElement *, ::javax::swing::MenuElement *);
-public: // actually package-private
-  BasicPopupMenuUI$KeyboardHelper(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper *);
-private:
-  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastSelectedPath;
-  ::java::awt::Component * lastFocused;
-  ::javax::swing::JRootPane * invokerRootPane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicPopupMenuUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
deleted file mode 100644
index 03fb5accb8d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class MenuElement;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicPopupMenuUI$NavigateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI$NavigateAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicPopupMenuUI$NavigateAction(::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  void navigateNextPrevious(jboolean);
-  ::javax::swing::MenuElement * findEnabledChild(JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuElement *, jboolean);
-  ::javax::swing::MenuElement * findEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jboolean);
-  ::javax::swing::MenuElement * findNextEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jint);
-  ::javax::swing::MenuElement * findPreviousEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jint);
-  void navigateParentChild(jboolean);
-  void cancel();
-  ::javax::swing::JPopupMenu * getLastPopup();
-  void doReturn();
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
deleted file mode 100644
index 3b8b580abb3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class PopupMenuEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicPopupMenuUI;
-            class BasicPopupMenuUI$PopupMenuHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI$PopupMenuHandler : public ::java::lang::Object
-{
-
-  BasicPopupMenuUI$PopupMenuHandler(::javax::swing::plaf::basic::BasicPopupMenuUI *);
-public:
-  virtual void popupMenuCanceled(::javax::swing::event::PopupMenuEvent *);
-  virtual void popupMenuWillBecomeInvisible(::javax::swing::event::PopupMenuEvent *);
-  virtual void popupMenuWillBecomeVisible(::javax::swing::event::PopupMenuEvent *);
-public: // actually package-private
-  BasicPopupMenuUI$PopupMenuHandler(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$PopupMenuHandler *);
-  ::javax::swing::plaf::basic::BasicPopupMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
deleted file mode 100644
index e88a2f884ff..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicPopupMenuUI;
-            class BasicPopupMenuUI$TopWindowListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener : public ::java::lang::Object
-{
-
-  BasicPopupMenuUI$TopWindowListener(::javax::swing::plaf::basic::BasicPopupMenuUI *);
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  BasicPopupMenuUI$TopWindowListener(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener *);
-  ::javax::swing::plaf::basic::BasicPopupMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
deleted file mode 100644
index 95bf37a9373..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/PopupMenuUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class JComponent;
-        class JPopupMenu;
-      namespace event
-      {
-          class PopupMenuListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicPopupMenuUI;
-            class BasicPopupMenuUI$KeyboardHelper;
-            class BasicPopupMenuUI$TopWindowListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI : public ::javax::swing::plaf::PopupMenuUI
-{
-
-public:
-  BasicPopupMenuUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void installDefaults();
-public: // actually protected
-  virtual void installListeners();
-  virtual void installKeyboardActions();
-public: // actually package-private
-  virtual void installKeyboardActionsImpl();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-  virtual void uninstallListeners();
-  virtual void uninstallKeyboardActions();
-public: // actually package-private
-  virtual void uninstallKeyboardActionsImpl();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
-public: // actually protected
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PopupMenuUI)))) popupMenu;
-private:
-  ::javax::swing::event::PopupMenuListener * popupMenuListener;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener * topWindowListener;
-private:
-  static jint numPopups;
-  static ::javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper * keyboardHelper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
deleted file mode 100644
index 54768d3a388..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class AncestorEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$AncestorHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$AncestorHandler : public ::java::lang::Object
-{
-
-  BasicProgressBarUI$AncestorHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
-public:
-  virtual void ancestorAdded(::javax::swing::event::AncestorEvent *);
-  virtual void ancestorRemoved(::javax::swing::event::AncestorEvent *);
-  virtual void ancestorMoved(::javax::swing::event::AncestorEvent *);
-public: // actually package-private
-  BasicProgressBarUI$AncestorHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$AncestorHandler *);
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
deleted file mode 100644
index 31c00bc61ee..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$Animator;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$Animator : public ::java::lang::Object
-{
-
-  BasicProgressBarUI$Animator(::javax::swing::plaf::basic::BasicProgressBarUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  BasicProgressBarUI$Animator(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$Animator *);
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
deleted file mode 100644
index e8296621a2d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$ChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$ChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicProgressBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
deleted file mode 100644
index 2f20e0f2490..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
-
-#pragma interface
-
-#include <java/awt/event/ComponentAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$ComponentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
-{
-
-  BasicProgressBarUI$ComponentHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  BasicProgressBarUI$ComponentHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$ComponentHandler *);
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
deleted file mode 100644
index 9d0d136fcaf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicProgressBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicProgressBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
deleted file mode 100644
index 85263b9378e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
+++ /dev/null
@@ -1,123 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI__
-#define __javax_swing_plaf_basic_BasicProgressBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ProgressBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class ComponentListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JProgressBar;
-        class Timer;
-      namespace event
-      {
-          class AncestorListener;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$Animator;
-            class BasicProgressBarUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI : public ::javax::swing::plaf::ProgressBarUI
-{
-
-public:
-  BasicProgressBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jint getAmountFull(::java::awt::Insets *, jint, jint);
-  virtual jint getAnimationIndex();
-  virtual ::java::awt::Rectangle * getBox(::java::awt::Rectangle *);
-  virtual jint getCellLength();
-  virtual jint getCellSpacing();
-public:
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getPreferredInnerHorizontal();
-  virtual ::java::awt::Dimension * getPreferredInnerVertical();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Color * getSelectionBackground();
-  virtual ::java::awt::Color * getSelectionForeground();
-  virtual ::java::awt::Point * getStringPlacement(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint, jint);
-  virtual void incrementAnimationIndex();
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintDeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paintIndeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paintString(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Insets *);
-  virtual void setAnimationIndex(jint);
-  virtual void setCellLength(jint);
-  virtual void setCellSpacing(jint);
-  virtual void startAnimationTimer();
-  virtual void stopAnimationTimer();
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ProgressBarUI)))) boxRect;
-private:
-  ::javax::swing::Timer * animationTimer;
-  jint animationIndex;
-  jint numFrames;
-  ::javax::swing::plaf::basic::BasicProgressBarUI$Animator * animation;
-  ::javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler * propertyListener;
-public: // actually protected
-  ::javax::swing::event::ChangeListener * changeListener;
-  ::javax::swing::JProgressBar * progressBar;
-public: // actually package-private
-  jdouble boxDependent;
-  jint boxIndependent;
-  jdouble incr;
-private:
-  jint cellLength;
-  jint cellSpacing;
-  ::java::awt::Color * selectionBackground;
-  ::java::awt::Color * selectionForeground;
-  ::javax::swing::event::AncestorListener * ancestorListener;
-  ::java::awt::event::ComponentListener * componentListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
deleted file mode 100644
index 5439b6722fe..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
-#define __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JMenuItem;
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicRadioButtonMenuItemUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRadioButtonMenuItemUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
-{
-
-public:
-  BasicRadioButtonMenuItemUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void processMouseEvent(::javax::swing::JMenuItem *, ::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
deleted file mode 100644
index deea3858586..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRadioButtonUI__
-#define __javax_swing_plaf_basic_BasicRadioButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToggleButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class Icon;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicRadioButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRadioButtonUI : public ::javax::swing::plaf::basic::BasicToggleButtonUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  BasicRadioButtonUI();
-public: // actually protected
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual ::javax::swing::Icon * getDefaultIcon();
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  ::javax::swing::Icon * getCurrentIcon(::javax::swing::AbstractButton *);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToggleButtonUI)))) icon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRadioButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
deleted file mode 100644
index 040c915022d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
-#define __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRootPane;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicRootPaneUI;
-            class BasicRootPaneUI$DefaultPressAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRootPaneUI$DefaultPressAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicRootPaneUI$DefaultPressAction(::javax::swing::plaf::basic::BasicRootPaneUI *, ::javax::swing::JRootPane *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) rootPane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicRootPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
deleted file mode 100644
index 1728960926d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
-#define __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRootPane;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicRootPaneUI;
-            class BasicRootPaneUI$DefaultReleaseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRootPaneUI$DefaultReleaseAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicRootPaneUI$DefaultReleaseAction(::javax::swing::plaf::basic::BasicRootPaneUI *, ::javax::swing::JRootPane *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) rootPane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicRootPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
deleted file mode 100644
index cf222b76fb6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRootPaneUI__
-#define __javax_swing_plaf_basic_BasicRootPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/RootPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JRootPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicRootPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRootPaneUI : public ::javax::swing::plaf::RootPaneUI
-{
-
-public:
-  BasicRootPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JRootPane *);
-  virtual void installComponents(::javax::swing::JRootPane *);
-  virtual void installListeners(::javax::swing::JRootPane *);
-  virtual void installKeyboardActions(::javax::swing::JRootPane *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults(::javax::swing::JRootPane *);
-  virtual void uninstallComponents(::javax::swing::JRootPane *);
-  virtual void uninstallListeners(::javax::swing::JRootPane *);
-  virtual void uninstallKeyboardActions(::javax::swing::JRootPane *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRootPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
deleted file mode 100644
index cd9673d17b4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$1__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$1(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
deleted file mode 100644
index 2d4479ac26e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$2__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$2(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
deleted file mode 100644
index ef2fcc6877e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$3__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$3 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$3(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
deleted file mode 100644
index 112745e75d4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$4__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$4__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$4 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$4(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
deleted file mode 100644
index 7fa7223dc18..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$5__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$5__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$5 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$5(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
deleted file mode 100644
index 23da9c5f49d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$6__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$6__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$6 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$6(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
deleted file mode 100644
index 85d942986d5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$ArrowButtonListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicScrollBarUI$ArrowButtonListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
deleted file mode 100644
index 472d5bd4b19..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$ModelListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$ModelListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicScrollBarUI$ModelListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
deleted file mode 100644
index b2afd716343..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicScrollBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicScrollBarUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
deleted file mode 100644
index 193e13f595e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$ScrollListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener : public ::java::lang::Object
-{
-
-public:
-  BasicScrollBarUI$ScrollListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
-  BasicScrollBarUI$ScrollListener(::javax::swing::plaf::basic::BasicScrollBarUI *, jint, jboolean);
-  virtual void setDirection(jint);
-  virtual void setScrollByBlock(jboolean);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) direction;
-  jboolean block;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
deleted file mode 100644
index b78648a31e2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$TrackListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$TrackListener : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicScrollBarUI$TrackListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
-public:
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual jboolean shouldScroll(jint);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) currentMouseX;
-  jint currentMouseY;
-  jint offset;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
deleted file mode 100644
index 64cd923aca4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
+++ /dev/null
@@ -1,174 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI__
-#define __javax_swing_plaf_basic_BasicScrollBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ScrollBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Container;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JButton;
-        class JComponent;
-        class JScrollBar;
-        class Timer;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$ArrowButtonListener;
-            class BasicScrollBarUI$ModelListener;
-            class BasicScrollBarUI$ScrollListener;
-            class BasicScrollBarUI$TrackListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI : public ::javax::swing::plaf::ScrollBarUI
-{
-
-public:
-  BasicScrollBarUI();
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-public: // actually protected
-  virtual void configureScrollBarColors();
-  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener * createArrowButtonListener();
-  virtual ::javax::swing::JButton * createIncreaseButton(jint);
-  virtual ::javax::swing::JButton * createDecreaseButton(jint);
-  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ModelListener * createModelListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener * createScrollListener();
-  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$TrackListener * createTrackListener();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getMaximumThumbSize();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getMinimumThumbSize();
-public: // actually package-private
-  virtual void calculatePreferredSize();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Rectangle * getThumbBounds();
-  virtual ::java::awt::Rectangle * getTrackBounds();
-  virtual void installComponents();
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-public: // actually package-private
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-public: // actually protected
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void layoutContainer(::java::awt::Container *);
-public: // actually protected
-  virtual void layoutHScrollbar(::javax::swing::JScrollBar *);
-  virtual void layoutVScrollbar(::javax::swing::JScrollBar *);
-public: // actually package-private
-  virtual void updateThumbRect();
-public:
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintDecreaseHighlight(::java::awt::Graphics *);
-  virtual void paintIncreaseHighlight(::java::awt::Graphics *);
-  virtual void paintThumb(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-  virtual void paintTrack(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-public:
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually protected
-  virtual void scrollByBlock(jint);
-public: // actually package-private
-  static void scrollByBlock(::javax::swing::JScrollBar *, jint);
-public: // actually protected
-  virtual void scrollByUnit(jint);
-public: // actually package-private
-  static void scrollByUnits(::javax::swing::JScrollBar *, jint, jint);
-public: // actually protected
-  virtual void setThumbBounds(jint, jint, jint, jint);
-  virtual void uninstallComponents();
-  virtual void uninstallDefaults();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually package-private
-  virtual jint valueForYPosition(jint);
-  virtual jint valueForXPosition(jint);
-public:
-  virtual jboolean isThumbRollover();
-public: // actually protected
-  virtual void setThumbRollover(jboolean);
-public:
-  virtual jboolean getSupportsAbsolutePositioning();
-public: // actually protected
-  ::javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollBarUI)))) buttonListener;
-  ::javax::swing::plaf::basic::BasicScrollBarUI$ModelListener * modelListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener * scrollListener;
-  ::javax::swing::plaf::basic::BasicScrollBarUI$TrackListener * trackListener;
-  ::javax::swing::JButton * decrButton;
-  ::javax::swing::JButton * incrButton;
-  ::java::awt::Dimension * maximumThumbSize;
-  ::java::awt::Dimension * minimumThumbSize;
-  ::java::awt::Color * thumbColor;
-  ::java::awt::Color * thumbDarkShadowColor;
-  ::java::awt::Color * thumbHighlightColor;
-  ::java::awt::Color * thumbLightShadowColor;
-  ::java::awt::Color * trackHighlightColor;
-  ::java::awt::Color * trackColor;
-  ::java::awt::Rectangle * trackRect;
-  ::java::awt::Rectangle * thumbRect;
-  static const jint DECREASE_HIGHLIGHT = 1;
-  static const jint INCREASE_HIGHLIGHT = 2;
-  static const jint NO_HIGHLIGHT = 0;
-private:
-  static const jint POSITIVE_SCROLL = 1;
-  static const jint NEGATIVE_SCROLL = -1;
-  ::java::awt::Dimension * preferredSize;
-public: // actually protected
-  jint trackHighlight;
-  jboolean isDragging;
-  ::javax::swing::Timer * scrollTimer;
-  ::javax::swing::JScrollBar * scrollbar;
-public: // actually package-private
-  jboolean thumbRollover;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
deleted file mode 100644
index 2a7342851e2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$1__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$1(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
deleted file mode 100644
index 6e112999aa5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$10__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$10__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$10;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$10 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$10(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$10__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
deleted file mode 100644
index 672b7153c3d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$2__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$2(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
deleted file mode 100644
index f69a2242acb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$3__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$3 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$3(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
deleted file mode 100644
index 9fabcaa422f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$4__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$4__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$4 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$4(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
deleted file mode 100644
index 22fb657c776..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$5__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$5__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$5 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$5(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
deleted file mode 100644
index f3d5560c248..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$6__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$6__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$6 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$6(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
deleted file mode 100644
index b8c2c95135a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$7__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$7__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$7;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$7 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$7(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
deleted file mode 100644
index f68cfa1aa73..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$8__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$8__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$8;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$8 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$8(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$8__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
deleted file mode 100644
index 246c7d973f2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$9__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$9__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$9;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$9 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$9(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$9__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
deleted file mode 100644
index b4cd0559369..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$HSBChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$HSBChangeListener : public ::java::lang::Object
-{
-
-public:
-  BasicScrollPaneUI$HSBChangeListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
deleted file mode 100644
index 33a3deb5d0b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace event
-      {
-          class MouseWheelEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$MouseWheelHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$MouseWheelHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicScrollPaneUI$MouseWheelHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-public:
-  virtual void mouseWheelMoved(::java::awt::event::MouseWheelEvent *);
-public: // actually package-private
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rect;
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
deleted file mode 100644
index d41feb6d487..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicScrollPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
deleted file mode 100644
index 53c4f804bf2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$VSBChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$VSBChangeListener : public ::java::lang::Object
-{
-
-public:
-  BasicScrollPaneUI$VSBChangeListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
deleted file mode 100644
index abbdc71b258..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$ViewportChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$ViewportChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicScrollPaneUI$ViewportChangeHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
deleted file mode 100644
index d0ca2438dbc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$ViewportContainerListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$ViewportContainerListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$ViewportContainerListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
deleted file mode 100644
index c06cf939f6f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ScrollPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-      namespace event
-      {
-          class ContainerListener;
-          class MouseWheelListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JComponent;
-        class JScrollPane;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI : public ::javax::swing::plaf::ScrollPaneUI
-{
-
-public:
-  BasicScrollPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JScrollPane *);
-  virtual void uninstallDefaults(::javax::swing::JScrollPane *);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installListeners(::javax::swing::JScrollPane *);
-public: // actually package-private
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-public: // actually protected
-  virtual void installKeyboardActions(::javax::swing::JScrollPane *);
-  virtual void uninstallKeyboardActions(::javax::swing::JScrollPane *);
-  virtual ::javax::swing::event::ChangeListener * createHSBChangeListener();
-  virtual ::javax::swing::event::ChangeListener * createVSBChangeListener();
-  virtual ::javax::swing::event::ChangeListener * createViewportChangeListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::event::MouseWheelListener * createMouseWheelListener();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallListeners(::javax::swing::JComponent *);
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void syncScrollPaneWithViewport();
-  virtual void updateColumnHeader(::java::beans::PropertyChangeEvent *);
-  virtual void updateRowHeader(::java::beans::PropertyChangeEvent *);
-  virtual void updateScrollBarDisplayPolicy(::java::beans::PropertyChangeEvent *);
-  virtual void updateViewport(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  static jint SCROLL_NON_SCROLLABLES;
-  static jint ROWS_PER_WHEEL_CLICK;
-public: // actually protected
-  ::javax::swing::JScrollPane * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollPaneUI)))) scrollpane;
-  ::javax::swing::event::ChangeListener * hsbChangeListener;
-  ::javax::swing::event::ChangeListener * vsbChangeListener;
-  ::javax::swing::event::ChangeListener * viewportChangeListener;
-  ::java::beans::PropertyChangeListener * spPropertyChangeListener;
-public: // actually package-private
-  ::java::awt::event::MouseWheelListener * mouseWheelListener;
-  ::java::awt::event::ContainerListener * containerListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
deleted file mode 100644
index f16b625f691..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSeparatorUI__
-#define __javax_swing_plaf_basic_BasicSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SeparatorUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JSeparator;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSeparatorUI : public ::javax::swing::plaf::SeparatorUI
-{
-
-public:
-  BasicSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JSeparator *);
-  virtual void uninstallDefaults(::javax::swing::JSeparator *);
-  virtual void installListeners(::javax::swing::JSeparator *);
-  virtual void uninstallListeners(::javax::swing::JSeparator *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SeparatorUI)))) shadow;
-  ::java::awt::Color * highlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
deleted file mode 100644
index 6f0c346aef0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$1__
-#define __javax_swing_plaf_basic_BasicSliderUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$1(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
deleted file mode 100644
index ddf707d4b96..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$2__
-#define __javax_swing_plaf_basic_BasicSliderUI$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$2(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
deleted file mode 100644
index 0e223c57638..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$3__
-#define __javax_swing_plaf_basic_BasicSliderUI$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$3 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$3(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
deleted file mode 100644
index 79205db3432..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$4__
-#define __javax_swing_plaf_basic_BasicSliderUI$4__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$4 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$4(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
deleted file mode 100644
index 824428b9457..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$5__
-#define __javax_swing_plaf_basic_BasicSliderUI$5__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$5 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$5(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
deleted file mode 100644
index 5e42cccd88c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$6__
-#define __javax_swing_plaf_basic_BasicSliderUI$6__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$6 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$6(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
deleted file mode 100644
index 739b384edb7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
-#define __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSlider;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ActionScroller;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$ActionScroller : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicSliderUI$ActionScroller(::javax::swing::plaf::basic::BasicSliderUI *, ::javax::swing::JSlider *, jint, jboolean);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
deleted file mode 100644
index ee9305b54d8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
-#define __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$ChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSliderUI$ChangeHandler(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
deleted file mode 100644
index f192a5bf04f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
-#define __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
-
-#pragma interface
-
-#include <java/awt/event/ComponentAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ComponentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
-{
-
-public:
-  BasicSliderUI$ComponentHandler(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
deleted file mode 100644
index bc91028571d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSliderUI$FocusHandler(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
deleted file mode 100644
index b03823785a6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSliderUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
deleted file mode 100644
index 0032d4943cc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
-#define __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ScrollListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$ScrollListener : public ::java::lang::Object
-{
-
-public:
-  BasicSliderUI$ScrollListener(::javax::swing::plaf::basic::BasicSliderUI *);
-  BasicSliderUI$ScrollListener(::javax::swing::plaf::basic::BasicSliderUI *, jint, jboolean);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void setDirection(jint);
-  virtual void setScrollByBlock(jboolean);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) direction;
-  jboolean block;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
deleted file mode 100644
index 1d6bda1eb47..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
-#define __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
-
-#pragma interface
-
-#include <javax/swing/event/MouseInputAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$TrackListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$TrackListener : public ::javax::swing::event::MouseInputAdapter
-{
-
-public:
-  BasicSliderUI$TrackListener(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual jboolean shouldScroll(jint);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) currentMouseX;
-  jint currentMouseY;
-  jint offset;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI.h b/libjava/javax/swing/plaf/basic/BasicSliderUI.h
deleted file mode 100644
index cb35faa26b0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI.h
+++ /dev/null
@@ -1,188 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI__
-#define __javax_swing_plaf_basic_BasicSliderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SliderUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-      namespace event
-      {
-          class ComponentListener;
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JComponent;
-        class JSlider;
-        class Timer;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ScrollListener;
-            class BasicSliderUI$TrackListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI : public ::javax::swing::plaf::SliderUI
-{
-
-public:
-  BasicSliderUI(::javax::swing::JSlider *);
-public: // actually protected
-  virtual jboolean isDragging();
-  virtual ::java::awt::Color * getShadowColor();
-  virtual ::java::awt::Color * getHighlightColor();
-  virtual ::java::awt::Color * getFocusColor();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JSlider *);
-  virtual ::javax::swing::plaf::basic::BasicSliderUI$TrackListener * createTrackListener(::javax::swing::JSlider *);
-  virtual ::javax::swing::event::ChangeListener * createChangeListener(::javax::swing::JSlider *);
-  virtual ::java::awt::event::ComponentListener * createComponentListener(::javax::swing::JSlider *);
-  virtual ::java::awt::event::FocusListener * createFocusListener(::javax::swing::JSlider *);
-  virtual ::javax::swing::plaf::basic::BasicSliderUI$ScrollListener * createScrollListener(::javax::swing::JSlider *);
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JSlider *);
-  virtual void installListeners(::javax::swing::JSlider *);
-  virtual void uninstallListeners(::javax::swing::JSlider *);
-  virtual void installKeyboardActions(::javax::swing::JSlider *);
-  virtual void uninstallKeyboardActions(::javax::swing::JSlider *);
-public:
-  virtual ::java::awt::Dimension * getPreferredHorizontalSize();
-  virtual ::java::awt::Dimension * getPreferredVerticalSize();
-  virtual ::java::awt::Dimension * getMinimumHorizontalSize();
-  virtual ::java::awt::Dimension * getMinimumVerticalSize();
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void calculateGeometry();
-  virtual void calculateFocusRect();
-  virtual void calculateThumbSize();
-  virtual void calculateContentRect();
-  virtual void calculateThumbLocation();
-  virtual void calculateTrackBuffer();
-  virtual ::java::awt::Dimension * getThumbSize();
-  virtual void calculateTrackRect();
-  virtual jint getTickLength();
-  virtual void calculateTickRect();
-  virtual void calculateLabelRect();
-  virtual jint getWidthOfWidestLabel();
-  virtual jint getHeightOfTallestLabel();
-  virtual jint getWidthOfHighValueLabel();
-  virtual jint getWidthOfLowValueLabel();
-  virtual jint getHeightOfHighValueLabel();
-  virtual jint getHeightOfLowValueLabel();
-  virtual jboolean drawInverted();
-  virtual ::java::awt::Component * getLowestValueLabel();
-  virtual ::java::awt::Component * getHighestValueLabel();
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void recalculateIfInsetsChanged();
-  virtual void recalculateIfOrientationChanged();
-public:
-  virtual void paintFocus(::java::awt::Graphics *);
-  virtual void paintTrack(::java::awt::Graphics *);
-  virtual void paintTicks(::java::awt::Graphics *);
-public: // actually protected
-  virtual void paintMinorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMajorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMinorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMajorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-public:
-  virtual void paintLabels(::java::awt::Graphics *);
-public: // actually protected
-  virtual void paintHorizontalLabel(::java::awt::Graphics *, jint, ::java::awt::Component *);
-  virtual void paintVerticalLabel(::java::awt::Graphics *, jint, ::java::awt::Component *);
-public:
-  virtual void paintThumb(::java::awt::Graphics *);
-  virtual void setThumbLocation(jint, jint);
-  virtual void scrollByBlock(jint);
-  virtual void scrollByUnit(jint);
-public: // actually protected
-  virtual void scrollDueToClickInTrack(jint);
-  virtual jint xPositionForValue(jint);
-  virtual jint yPositionForValue(jint);
-public:
-  virtual jint valueForYPosition(jint);
-  virtual jint valueForXPosition(jint);
-public: // actually package-private
-  virtual jint findClosestTick(jint);
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-private:
-  jboolean hitClip(::java::awt::Graphics *, ::java::awt::Rectangle *);
-public: // actually protected
-  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SliderUI)))) changeListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::plaf::basic::BasicSliderUI$ScrollListener * scrollListener;
-  ::java::awt::event::ComponentListener * componentListener;
-  ::java::awt::event::FocusListener * focusListener;
-  ::javax::swing::plaf::basic::BasicSliderUI$TrackListener * trackListener;
-  ::java::awt::Insets * focusInsets;
-  ::java::awt::Insets * insetCache;
-  ::java::awt::Rectangle * contentRect;
-  ::java::awt::Rectangle * focusRect;
-  ::java::awt::Rectangle * thumbRect;
-  ::java::awt::Rectangle * tickRect;
-  ::java::awt::Rectangle * labelRect;
-  ::java::awt::Rectangle * trackRect;
-public:
-  static const jint MAX_SCROLL = 2;
-  static const jint MIN_SCROLL = -2;
-  static const jint NEGATIVE_SCROLL = -1;
-  static const jint POSITIVE_SCROLL = 1;
-public: // actually protected
-  jint trackBuffer;
-  jboolean leftToRightCache;
-  ::javax::swing::Timer * scrollTimer;
-  ::javax::swing::JSlider * slider;
-private:
-  ::java::awt::Color * shadowColor;
-  ::java::awt::Color * highlightColor;
-  ::java::awt::Color * focusColor;
-public: // actually package-private
-  jboolean dragging;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
deleted file mode 100644
index f303a6e46fd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$1__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI;
-            class BasicSpinnerUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicSpinnerUI$1(::javax::swing::plaf::basic::BasicSpinnerUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
deleted file mode 100644
index 9d8f2041583..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$2__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$2__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI;
-            class BasicSpinnerUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$2 : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  BasicSpinnerUI$2(::javax::swing::plaf::basic::BasicSpinnerUI *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void increment();
-  jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
-  ::javax::swing::Timer * timer;
-  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
deleted file mode 100644
index 84849e21850..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$3__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI$2;
-            class BasicSpinnerUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicSpinnerUI$3(::javax::swing::plaf::basic::BasicSpinnerUI$2 *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI$2 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
deleted file mode 100644
index 3ec6936a04c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$4__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$4__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI;
-            class BasicSpinnerUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$4 : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  BasicSpinnerUI$4(::javax::swing::plaf::basic::BasicSpinnerUI *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void decrement();
-  jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
-  ::javax::swing::Timer * timer;
-  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
deleted file mode 100644
index 094cc9a64a0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$5__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$5__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI$4;
-            class BasicSpinnerUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$5 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicSpinnerUI$5(::javax::swing::plaf::basic::BasicSpinnerUI$4 *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI$4 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
deleted file mode 100644
index 552ee52f5dd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI;
-            class BasicSpinnerUI$DefaultLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$DefaultLayoutManager : public ::java::lang::Object
-{
-
-  BasicSpinnerUI$DefaultLayoutManager(::javax::swing::plaf::basic::BasicSpinnerUI *);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-private:
-  ::java::awt::Dimension * prefSize(::java::awt::Component *);
-  void setBounds(::java::awt::Component *, jint, jint, jint, jint);
-public: // actually package-private
-  BasicSpinnerUI$DefaultLayoutManager(::javax::swing::plaf::basic::BasicSpinnerUI *, ::javax::swing::plaf::basic::BasicSpinnerUI$DefaultLayoutManager *);
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) editor;
-  ::java::awt::Component * next;
-  ::java::awt::Component * previous;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
deleted file mode 100644
index aa148b77187..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI__
-#define __javax_swing_plaf_basic_BasicSpinnerUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SpinnerUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JSpinner;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSpinnerUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI : public ::javax::swing::plaf::SpinnerUI
-{
-
-public:
-  BasicSpinnerUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::javax::swing::JComponent * createEditor();
-  virtual ::java::awt::LayoutManager * createLayout();
-  virtual ::java::awt::Component * createNextButton();
-  virtual ::java::awt::Component * createPreviousButton();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void installDefaults();
-  virtual void installListeners();
-  virtual void installNextButtonListeners(::java::awt::Component *);
-  virtual void installPreviousButtonListeners(::java::awt::Component *);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void replaceEditor(::javax::swing::JComponent *, ::javax::swing::JComponent *);
-  virtual void uninstallDefaults();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SpinnerUI)))) spinner;
-private:
-  ::java::beans::PropertyChangeListener * listener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
deleted file mode 100644
index cd51091307b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$BasicOneTouchButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$BasicOneTouchButton : public ::javax::swing::JButton
-{
-
-public: // actually package-private
-  BasicSplitPaneDivider$BasicOneTouchButton(::javax::swing::plaf::basic::BasicSplitPaneDivider *, jint);
-public:
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual jboolean isFocusTraversable();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually package-private
-  static const jint LEFT = 0;
-  static const jint RIGHT = 1;
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) xpoints;
-  JArray< jint > * ypoints;
-  jint direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
deleted file mode 100644
index 418b6dcd845..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$DividerLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$DividerLayout : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicSplitPaneDivider$DividerLayout(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
deleted file mode 100644
index 902a5725ca3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$DragController;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$DragController : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicSplitPaneDivider$DragController(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::java::awt::event::MouseEvent *);
-  virtual jboolean isValid();
-  virtual jint positionForMouseEvent(::java::awt::event::MouseEvent *);
-  virtual jint getNeededLocation(jint, jint);
-  virtual void continueDrag(jint, jint);
-  virtual void continueDrag(::java::awt::event::MouseEvent *);
-  virtual void completeDrag(jint, jint);
-  virtual void completeDrag(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual jint adjust(jint, jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) offset;
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
deleted file mode 100644
index bafbfee1b78..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$MouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$MouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicSplitPaneDivider$MouseHandler(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) isDragging;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
deleted file mode 100644
index bc1538536ea..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$OneTouchAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$OneTouchAction : public ::java::lang::Object
-{
-
-  BasicSplitPaneDivider$OneTouchAction(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  BasicSplitPaneDivider$OneTouchAction(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::javax::swing::plaf::basic::BasicSplitPaneDivider$OneTouchAction *);
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
deleted file mode 100644
index cc1a14915bc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$VerticalDragController;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$VerticalDragController : public ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController
-{
-
-public: // actually protected
-  BasicSplitPaneDivider$VerticalDragController(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::java::awt::event::MouseEvent *);
-  virtual jint getNeededLocation(jint, jint);
-  virtual jint positionForMouseEvent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual jint adjust(jint, jint);
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
deleted file mode 100644
index a4c51fc5588..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JButton;
-        class JSplitPane;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$DragController;
-            class BasicSplitPaneDivider$MouseHandler;
-            class BasicSplitPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider : public ::java::awt::Container
-{
-
-public:
-  BasicSplitPaneDivider(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void setBasicSplitPaneUI(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual ::javax::swing::plaf::basic::BasicSplitPaneUI * getBasicSplitPaneUI();
-  virtual void setDividerSize(jint);
-  virtual jint getDividerSize();
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual ::javax::swing::border::Border * getBorder();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void paint(::java::awt::Graphics *);
-public: // actually protected
-  virtual void oneTouchExpandableChanged();
-  virtual ::javax::swing::JButton * createLeftOneTouchButton();
-  virtual ::javax::swing::JButton * createRightOneTouchButton();
-  virtual void prepareForDragging();
-  virtual void dragDividerTo(jint);
-  virtual void finishDraggingTo(jint);
-public: // actually package-private
-  virtual void moveDividerTo(jint);
-  static const jlong serialVersionUID = 1463404307042803342LL;
-public: // actually protected
-  static const jint ONE_TOUCH_SIZE = 6;
-  static const jint ONE_TOUCH_OFFSET = 2;
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController * __attribute__((aligned(__alignof__( ::java::awt::Container)))) dragger;
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * splitPaneUI;
-  jint dividerSize;
-  ::java::awt::Component * hiddenDivider;
-  ::javax::swing::JSplitPane * splitPane;
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider$MouseHandler * mouseHandler;
-  jint orientation;
-  ::javax::swing::JButton * leftButton;
-  ::javax::swing::JButton * rightButton;
-private:
-  ::javax::swing::border::Border * border;
-public: // actually package-private
-  jint currentDividerLocation;
-  jboolean centerOneTouchButtons;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
deleted file mode 100644
index 16005e6d85b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$1__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$1(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
deleted file mode 100644
index 9fea0b4458c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$2__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$2(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
deleted file mode 100644
index 70833ad11ae..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$3__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$3 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$3(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
deleted file mode 100644
index a1bf3512146..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$4__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$4__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$4 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$4(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
deleted file mode 100644
index 9dc822fcb84..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$5__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$5__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$5 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$5(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
deleted file mode 100644
index 8b182f1f853..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$6__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$6__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$6 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$6(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
deleted file mode 100644
index 517b5a0f831..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$7__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$7__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$7;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$7 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$7(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
deleted file mode 100644
index 88213ffb17d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$8__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$8__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$8;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$8 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$8(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$8__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
deleted file mode 100644
index 7f3b3932f36..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$BasicHorizontalLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$BasicHorizontalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  BasicSplitPaneUI$BasicHorizontalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *, jint);
-public:
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-public: // actually protected
-  virtual jint getAvailableSize(::java::awt::Dimension *, ::java::awt::Insets *);
-  virtual jint getInitialLocation(::java::awt::Insets *);
-public:
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-public: // actually protected
-  virtual jint getPreferredSizeOfComponent(::java::awt::Component *);
-  virtual jint getSizeOfComponent(::java::awt::Component *);
-  virtual JArray< jint > * getSizes();
-public:
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually protected
-  virtual void resetSizeAt(jint);
-public:
-  virtual void resetToPreferredSizes();
-public: // actually protected
-  virtual void setComponentToSize(::java::awt::Component *, jint, jint, ::java::awt::Insets *, ::java::awt::Dimension *);
-  virtual void setSizes(JArray< jint > *);
-  virtual void updateComponents();
-public: // actually package-private
-  virtual void distributeExtraSpace();
-  virtual jint minimumSizeOfComponent(jint);
-public: // actually protected
-  JArray< ::java::awt::Component * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
-  JArray< jint > * sizes;
-private:
-  jint axis;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
deleted file mode 100644
index 47f78ce61c4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$BasicVerticalLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$BasicVerticalLayoutManager : public ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager
-{
-
-public:
-  BasicSplitPaneUI$BasicVerticalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
deleted file mode 100644
index a338ae8cfb9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
-
-#pragma interface
-
-#include <java/awt/event/FocusAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$FocusHandler : public ::java::awt::event::FocusAdapter
-{
-
-public:
-  BasicSplitPaneUI$FocusHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::FocusAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
deleted file mode 100644
index 439de5c724a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardDownRightHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardDownRightHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardDownRightHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
deleted file mode 100644
index 4b474d91246..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardEndHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardEndHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardEndHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
deleted file mode 100644
index 755d657f059..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardHomeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardHomeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardHomeHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
deleted file mode 100644
index 34e9acdc21c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardResizeToggleHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardResizeToggleHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardResizeToggleHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
deleted file mode 100644
index ce00ebc9d91..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardUpLeftHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardUpLeftHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardUpLeftHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
deleted file mode 100644
index 87f023b5fed..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$PropertyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$PropertyHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$PropertyHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
deleted file mode 100644
index fdbcb1519f6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
+++ /dev/null
@@ -1,149 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SplitPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-      namespace event
-      {
-          class ActionListener;
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JComponent;
-        class JSplitPane;
-        class KeyStroke;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$BasicHorizontalLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI : public ::javax::swing::plaf::SplitPaneUI
-{
-
-public:
-  BasicSplitPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-public: // actually package-private
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-public: // actually protected
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardUpLeftListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardDownRightListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardHomeListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardEndListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardResizeToggleListener();
-public:
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual jboolean isContinuousLayout();
-  virtual void setContinuousLayout(jboolean);
-  virtual jint getLastDragLocation();
-  virtual void setLastDragLocation(jint);
-  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * getDivider();
-public: // actually protected
-  virtual ::java::awt::Component * createDefaultNonContinuousLayoutDivider();
-  virtual void setNonContinuousLayoutDivider(::java::awt::Component *);
-  virtual void setNonContinuousLayoutDivider(::java::awt::Component *, jboolean);
-public:
-  virtual ::java::awt::Component * getNonContinuousLayoutDivider();
-  virtual ::javax::swing::JSplitPane * getSplitPane();
-  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * createDefaultDivider();
-  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *);
-  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint);
-  virtual jint getDividerLocation(::javax::swing::JSplitPane *);
-  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *);
-  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *);
-  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Insets * getInsets(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void resetLayoutManager();
-  virtual void startDragging();
-  virtual void dragDividerTo(jint);
-  virtual void finishDraggingTo(jint);
-  virtual jint getDividerBorderSize();
-private:
-  jint validLocation(jint);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::SplitPaneUI)))) beginDragDividerLocation;
-  jint dividerSize;
-public: // actually package-private
-  jint lastDragLocation;
-public: // actually protected
-  static jint KEYBOARD_DIVIDER_MOVE_OFFSET;
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * divider;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::java::awt::event::FocusListener * focusListener;
-  ::java::awt::event::ActionListener * keyboardDownRightListener;
-  ::java::awt::event::ActionListener * keyboardEndListener;
-  ::java::awt::event::ActionListener * keyboardHomeListener;
-  ::java::awt::event::ActionListener * keyboardResizeToggleListener;
-  ::java::awt::event::ActionListener * keyboardUpLeftListener;
-  ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager * layoutManager;
-  ::javax::swing::KeyStroke * dividerResizeToggleKey;
-  ::javax::swing::KeyStroke * downKey;
-  ::javax::swing::KeyStroke * endKey;
-  ::javax::swing::KeyStroke * homeKey;
-  ::javax::swing::KeyStroke * leftKey;
-  ::javax::swing::KeyStroke * rightKey;
-  ::javax::swing::KeyStroke * upKey;
-  jboolean draggingHW;
-  static ::java::lang::String * NON_CONTINUOUS_DIVIDER;
-  ::java::awt::Component * nonContinuousLayoutDivider;
-  ::javax::swing::JSplitPane * splitPane;
-public: // actually package-private
-  jboolean dividerLocationSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
deleted file mode 100644
index 4545f105d1d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
-
-#pragma interface
-
-#include <java/awt/event/FocusAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$FocusHandler : public ::java::awt::event::FocusAdapter
-{
-
-public:
-  BasicTabbedPaneUI$FocusHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::FocusAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
deleted file mode 100644
index c36fc50205b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$MouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$MouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  BasicTabbedPaneUI$MouseHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void redispatchEvent(::java::awt::event::MouseEvent *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
deleted file mode 100644
index 17596c23215..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$NavigateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigateAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicTabbedPaneUI$NavigateAction(::java::lang::String *, jint);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
deleted file mode 100644
index 52e7e35cdc7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$NavigatePageDownAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigatePageDownAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTabbedPaneUI$NavigatePageDownAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
deleted file mode 100644
index c5195afb580..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$NavigatePageUpAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigatePageUpAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTabbedPaneUI$NavigatePageUpAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
deleted file mode 100644
index 09e568fe4de..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTabbedPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
deleted file mode 100644
index 1ee8f725be1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$RequestFocusAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$RequestFocusAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTabbedPaneUI$RequestFocusAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
deleted file mode 100644
index cbb776a3474..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$RequestFocusForVisibleComponentAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$RequestFocusForVisibleComponentAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTabbedPaneUI$RequestFocusForVisibleComponentAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
deleted file mode 100644
index 895072d427e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicArrowButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$ScrollingButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton : public ::javax::swing::plaf::basic::BasicArrowButton
-{
-
-public:
-  BasicTabbedPaneUI$ScrollingButton(::javax::swing::plaf::basic::BasicTabbedPaneUI *, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicArrowButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
deleted file mode 100644
index d896ca00a56..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicPanelUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$ScrollingPanel;
-            class BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI : public ::javax::swing::plaf::basic::BasicPanelUI
-{
-
-  BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually package-private
-  BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicPanelUI)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
deleted file mode 100644
index 4c1d483448c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$ScrollingPanel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel : public ::javax::swing::JPanel
-{
-
-  BasicTabbedPaneUI$ScrollingPanel(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-public:
-  virtual void updateUI();
-public: // actually package-private
-  BasicTabbedPaneUI$ScrollingPanel(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
-  static ::javax::swing::plaf::basic::BasicTabbedPaneUI * access$1(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
deleted file mode 100644
index 2469bbe27e0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
-
-#pragma interface
-
-#include <javax/swing/JViewport.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$ScrollingViewport;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport : public ::javax::swing::JViewport
-{
-
-  BasicTabbedPaneUI$ScrollingViewport(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-public: // actually package-private
-  BasicTabbedPaneUI$ScrollingViewport(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::JViewport)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
deleted file mode 100644
index ad26176e00e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$TabSelectionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$TabSelectionHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTabbedPaneUI$TabSelectionHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
deleted file mode 100644
index a56abd9f4c8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$TabbedPaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout : public ::java::lang::Object
-{
-
-public:
-  BasicTabbedPaneUI$TabbedPaneLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void calculateLayoutInfo();
-public: // actually protected
-  virtual ::java::awt::Dimension * calculateSize(jboolean);
-  virtual void calculateTabRects(jint, jint);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-public: // actually protected
-  virtual void normalizeTabRuns(jint, jint, jint, jint);
-  virtual void padSelectedTab(jint, jint);
-  virtual void padTabRun(jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-public: // actually protected
-  virtual jint preferredTabAreaHeight(jint, jint);
-  virtual jint preferredTabAreaWidth(jint, jint);
-  virtual void rotateTabRuns(jint, jint);
-public:
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
deleted file mode 100644
index 87642f720ab..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$TabbedPaneScrollLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneScrollLayout : public ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout
-{
-
-  BasicTabbedPaneUI$TabbedPaneScrollLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-public:
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-public: // actually protected
-  virtual jint preferredTabAreaHeight(jint, jint);
-  virtual jint preferredTabAreaWidth(jint, jint);
-  virtual void calculateTabRects(jint, jint);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-public: // actually package-private
-  BasicTabbedPaneUI$TabbedPaneScrollLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneScrollLayout *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
deleted file mode 100644
index a20eedbb569..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
+++ /dev/null
@@ -1,223 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TabbedPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Insets;
-        class LayoutManager;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-          class MouseListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class Icon;
-        class JComponent;
-        class JTabbedPane;
-        class KeyStroke;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$ScrollingButton;
-            class BasicTabbedPaneUI$ScrollingPanel;
-            class BasicTabbedPaneUI$ScrollingViewport;
-        }
-      }
-      namespace text
-      {
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI : public ::javax::swing::plaf::TabbedPaneUI
-{
-
-public:
-  BasicTabbedPaneUI();
-public: // actually package-private
-  virtual ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * createIncreaseButton();
-  virtual ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * createDecreaseButton();
-  virtual ::java::awt::Point * findPointForIndex(jint);
-  virtual void scrollTab(jint, jint);
-  virtual void updateButtons();
-  virtual void updateViewPosition();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual void installComponents();
-  virtual void uninstallComponents();
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual ::java::awt::event::MouseListener * createMouseListener();
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintTabArea(::java::awt::Graphics *, jint, jint);
-  virtual void paintTab(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  virtual void layoutLabel(jint, ::java::awt::FontMetrics *, jint, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
-  virtual void paintIcon(::java::awt::Graphics *, jint, jint, ::javax::swing::Icon *, ::java::awt::Rectangle *, jboolean);
-  virtual void paintText(::java::awt::Graphics *, jint, ::java::awt::Font *, ::java::awt::FontMetrics *, jint, ::java::lang::String *, ::java::awt::Rectangle *, jboolean);
-  virtual jint getTabLabelShiftX(jint, jint, jboolean);
-  virtual jint getTabLabelShiftY(jint, jint, jboolean);
-  virtual void paintFocusIndicator(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
-  virtual void paintTabBorder(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintTabBackground(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintContentBorder(::java::awt::Graphics *, jint, jint);
-  virtual void paintContentBorderTopEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderLeftEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderBottomEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderRightEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint);
-  virtual jint getTabRunCount(::javax::swing::JTabbedPane *);
-  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint);
-public: // actually protected
-  virtual ::java::awt::Rectangle * getTabBounds(jint, ::java::awt::Rectangle *);
-  virtual ::java::awt::Component * getVisibleComponent();
-  virtual void setVisibleComponent(::java::awt::Component *);
-  virtual void assureRectsCreated(jint);
-  virtual void expandTabRunsArray();
-  virtual jint getRunForTab(jint, jint);
-  virtual jint lastTabInRun(jint, jint);
-  virtual jint getTabRunOverlay(jint);
-  virtual jint getTabRunIndent(jint, jint);
-  virtual jboolean shouldPadTabRun(jint, jint);
-  virtual jboolean shouldRotateTabRuns(jint);
-  virtual ::javax::swing::Icon * getIconForTab(jint);
-  virtual ::javax::swing::text::View * getTextViewForTab(jint);
-  virtual jint calculateTabHeight(jint, jint, jint);
-  virtual jint calculateMaxTabHeight(jint);
-  virtual jint calculateTabWidth(jint, jint, ::java::awt::FontMetrics *);
-  virtual jint calculateMaxTabWidth(jint);
-  virtual jint calculateTabAreaHeight(jint, jint, jint);
-  virtual jint calculateTabAreaWidth(jint, jint, jint);
-  virtual ::java::awt::Insets * getTabInsets(jint, jint);
-  virtual ::java::awt::Insets * getSelectedTabPadInsets(jint);
-  virtual ::java::awt::Insets * getTabAreaInsets(jint);
-  virtual ::java::awt::Insets * getContentBorderInsets(jint);
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual void navigateSelectedTab(jint);
-  virtual void selectNextTabInRun(jint);
-  virtual void selectPreviousTabInRun(jint);
-  virtual void selectNextTab(jint);
-  virtual void selectPreviousTab(jint);
-  virtual void selectAdjacentRunTab(jint, jint, jint);
-  virtual jint getTabRunOffset(jint, jint, jint, jboolean);
-  virtual jint getPreviousTabIndex(jint);
-  virtual jint getNextTabIndex(jint);
-  virtual jint getNextTabIndexInRun(jint, jint);
-  virtual jint getPreviousTabIndexInRun(jint, jint);
-  virtual jint getPreviousTabRun(jint);
-  virtual jint getNextTabRun(jint);
-  static void rotateInsets(::java::awt::Insets *, ::java::awt::Insets *, jint);
-public: // actually package-private
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-public: // actually protected
-  virtual void setRolloverTab(jint);
-  virtual jint getRolloverTab();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TabbedPaneUI)))) incrButton;
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * decrButton;
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport * viewport;
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel * panel;
-  jint currentScrollLocation;
-  jint currentScrollOffset;
-public: // actually protected
-  ::java::awt::Rectangle * calcRect;
-  JArray< ::java::awt::Rectangle * > * rects;
-  ::java::awt::Insets * contentBorderInsets;
-  ::java::awt::Insets * selectedTabPadInsets;
-  ::java::awt::Insets * tabAreaInsets;
-  ::java::awt::Insets * tabInsets;
-  ::java::awt::Color * darkShadow;
-  ::java::awt::Color * focus;
-  ::java::awt::Color * highlight;
-  ::java::awt::Color * lightHighlight;
-  ::java::awt::Color * shadow;
-  jint maxTabHeight;
-  jint maxTabWidth;
-  jint runCount;
-  jint selectedRun;
-  jint tabRunOverlay;
-  jint textIconGap;
-  JArray< jint > * tabRuns;
-public: // actually package-private
-  jboolean tabRunsDirty;
-public: // actually protected
-  ::javax::swing::KeyStroke * downKey;
-  ::javax::swing::KeyStroke * leftKey;
-  ::javax::swing::KeyStroke * rightKey;
-  ::javax::swing::KeyStroke * upKey;
-  ::java::awt::event::FocusListener * focusListener;
-  ::java::awt::event::MouseListener * mouseListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::event::ChangeListener * tabChangeListener;
-  ::javax::swing::JTabbedPane * tabPane;
-public: // actually package-private
-  ::java::awt::LayoutManager * layoutManager;
-  ::java::awt::Rectangle * tabAreaRect;
-  ::java::awt::Rectangle * contentRect;
-private:
-  jint rolloverTab;
-  jboolean tabsOpaque;
-  ::java::awt::Component * visibleComponent;
-  ::java::awt::Color * selectedColor;
-  ::java::awt::Rectangle * tempTextRect;
-  ::java::awt::Rectangle * tempIconRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
deleted file mode 100644
index 1e2347561ee..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI$1__
-#define __javax_swing_plaf_basic_BasicTableHeaderUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableHeaderUI$1;
-            class BasicTableHeaderUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableHeaderUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTableHeaderUI$1(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableHeaderUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
deleted file mode 100644
index 379f3ac293f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableHeaderUI;
-            class BasicTableHeaderUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTableHeaderUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTableHeaderUI *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void endResizing();
-  virtual void endDragging(::java::awt::event::MouseEvent *);
-  static ::javax::swing::plaf::basic::BasicTableHeaderUI * access$0(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) showingResizeCursor;
-  jint draggingFrom;
-  jint draggingColumnNumber;
-  jint prevPrefWidth;
-  ::javax::swing::Timer * timer;
-  ::javax::swing::plaf::basic::BasicTableHeaderUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
deleted file mode 100644
index 4a31c132e4a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI__
-#define __javax_swing_plaf_basic_BasicTableHeaderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TableHeaderUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Cursor;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class CellRendererPane;
-        class JComponent;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTableHeaderUI;
-        }
-      }
-      namespace table
-      {
-          class JTableHeader;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableHeaderUI : public ::javax::swing::plaf::TableHeaderUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
-public:
-  BasicTableHeaderUI();
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually package-private
-  static void access$0(::javax::swing::plaf::basic::BasicTableHeaderUI *, ::java::awt::Cursor *);
-  static ::java::awt::Cursor * access$1(::javax::swing::plaf::basic::BasicTableHeaderUI *);
-  static jint COLUMN_BOUNDARY_TOLERANCE;
-public: // actually protected
-  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableHeaderUI)))) header;
-  ::javax::swing::event::MouseInputListener * mouseInputListener;
-  ::javax::swing::CellRendererPane * rendererPane;
-private:
-  ::javax::swing::border::Border * cellBorder;
-  ::java::awt::Cursor * originalCursor;
-public: // actually package-private
-  ::java::awt::Rectangle * draggingHeaderRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableHeaderUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
deleted file mode 100644
index e7ff31e5d6d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTableUI$FocusHandler(::javax::swing::plaf::basic::BasicTableUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-private:
-  void repaintLeadCell();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
deleted file mode 100644
index f70e6d3c8dc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
-#define __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$KeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$KeyHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTableUI$KeyHandler(::javax::swing::plaf::basic::BasicTableUI *);
-  virtual void keyTyped(::java::awt::event::KeyEvent *);
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
deleted file mode 100644
index a0fb583afe0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTableUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTableUI *);
-private:
-  void updateSelection(jboolean);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::java::awt::Point * __attribute__((aligned(__alignof__( ::java::lang::Object)))) begin;
-  ::java::awt::Point * curr;
-  ::javax::swing::plaf::basic::BasicTableUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
deleted file mode 100644
index e51aad5c042..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicTableUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTableUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicTableUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTableUI *, ::javax::swing::plaf::basic::BasicTableUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h b/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
deleted file mode 100644
index 44a245c51cc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$TableAction__
-#define __javax_swing_plaf_basic_BasicTableUI$TableAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class ListSelectionModel;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI$TableAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$TableAction : public ::javax::swing::AbstractAction
-{
-
-  BasicTableUI$TableAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  virtual jint getFirstVisibleColumnIndex(::javax::swing::JTable *);
-  virtual jint getLastVisibleColumnIndex(::javax::swing::JTable *);
-  virtual jint getFirstVisibleRowIndex(::javax::swing::JTable *);
-  virtual jint getLastVisibleRowIndex(::javax::swing::JTable *);
-  virtual void advanceMultipleSelection(::javax::swing::JTable *, ::javax::swing::ListSelectionModel *, jint, jint, ::javax::swing::ListSelectionModel *, jint, jint, jboolean, jboolean);
-  virtual void advanceSingleSelection(::javax::swing::ListSelectionModel *, jint, ::javax::swing::ListSelectionModel *, jint, jboolean);
-  BasicTableUI$TableAction(::javax::swing::plaf::basic::BasicTableUI$TableAction *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$TableAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI.h b/libjava/javax/swing/plaf/basic/BasicTableUI.h
deleted file mode 100644
index 6abd88fcbfe..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI__
-#define __javax_swing_plaf_basic_BasicTableUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TableUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-          class KeyListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class CellRendererPane;
-        class JComponent;
-        class JTable;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$TableAction;
-        }
-      }
-      namespace table
-      {
-          class TableCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI : public ::javax::swing::plaf::TableUI
-{
-
-public:
-  BasicTableUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
-  virtual ::java::awt::event::KeyListener * createKeyListener();
-public:
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-private:
-  jint getHeight();
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public: // actually protected
-  virtual void installListeners();
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually package-private
-  virtual void paintCell(::java::awt::Graphics *, jint, jint, ::java::awt::Rectangle *, ::javax::swing::table::TableCellRenderer *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::event::FocusListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableUI)))) focusListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::javax::swing::event::MouseInputListener * mouseInputListener;
-  ::javax::swing::CellRendererPane * rendererPane;
-  ::javax::swing::JTable * table;
-public: // actually package-private
-  ::javax::swing::border::Border * cellBorder;
-  ::javax::swing::plaf::basic::BasicTableUI$TableAction * action;
-private:
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h b/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
deleted file mode 100644
index c05b92a0c88..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextAreaUI__
-#define __javax_swing_plaf_basic_BasicTextAreaUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTextAreaUI;
-        }
-      }
-      namespace text
-      {
-          class Element;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextAreaUI : public ::javax::swing::plaf::basic::BasicTextUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  BasicTextAreaUI();
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextAreaUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h b/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
deleted file mode 100644
index be9a77ca0ed..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextFieldUI__
-#define __javax_swing_plaf_basic_BasicTextFieldUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTextFieldUI;
-        }
-      }
-      namespace text
-      {
-          class Element;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextFieldUI : public ::javax::swing::plaf::basic::BasicTextUI
-{
-
-public:
-  BasicTextFieldUI();
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h b/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
deleted file mode 100644
index 62d9deb3f35..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextPaneUI__
-#define __javax_swing_plaf_basic_BasicTextPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicEditorPaneUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTextPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextPaneUI : public ::javax::swing::plaf::basic::BasicEditorPaneUI
-{
-
-public:
-  BasicTextPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
deleted file mode 100644
index c89238e10d4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
-#define __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultCaret.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI$BasicCaret;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$BasicCaret : public ::javax::swing::text::DefaultCaret
-{
-
-public:
-  BasicTextUI$BasicCaret();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
deleted file mode 100644
index 657f780f93d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
-#define __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultHighlighter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI$BasicHighlighter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$BasicHighlighter : public ::javax::swing::text::DefaultHighlighter
-{
-
-public:
-  BasicTextUI$BasicHighlighter();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
deleted file mode 100644
index 05267889e7a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$FocusHandler : public ::java::lang::Object
-{
-
-  BasicTextUI$FocusHandler();
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  BasicTextUI$FocusHandler(::javax::swing::plaf::basic::BasicTextUI$FocusHandler *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
deleted file mode 100644
index a8ca57be7bd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$Handler__
-#define __javax_swing_plaf_basic_BasicTextUI$Handler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$Handler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$Handler : public ::java::lang::Object
-{
-
-  BasicTextUI$Handler(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
-public: // actually package-private
-  BasicTextUI$Handler(::javax::swing::plaf::basic::BasicTextUI *, ::javax::swing::plaf::basic::BasicTextUI$Handler *);
-  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$Handler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h b/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
deleted file mode 100644
index 33044598a04..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$RootView__
-#define __javax_swing_plaf_basic_BasicTextUI$RootView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$RootView;
-        }
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$RootView : public ::javax::swing::text::View
-{
-
-public:
-  BasicTextUI$RootView(::javax::swing::plaf::basic::BasicTextUI *);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  virtual void setView(::javax::swing::text::View *);
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual jint getViewCount();
-  virtual ::java::awt::Container * getContainer();
-  virtual void setSize(jfloat, jfloat);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-private:
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) view;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTextUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$RootView__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI.h b/libjava/javax/swing/plaf/basic/BasicTextUI.h
deleted file mode 100644
index f96f1332309..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI__
-#define __javax_swing_plaf_basic_BasicTextUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TextUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JComponent;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$Handler;
-            class BasicTextUI$RootView;
-        }
-      }
-      namespace text
-      {
-          class Caret;
-          class EditorKit;
-          class Element;
-          class Highlighter;
-          class JTextComponent;
-          class Keymap;
-          class Position$Bias;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI : public ::javax::swing::plaf::TextUI
-{
-
-public:
-  BasicTextUI();
-public: // actually protected
-  virtual ::javax::swing::text::Caret * createCaret();
-  virtual ::javax::swing::text::Highlighter * createHighlighter();
-  virtual ::javax::swing::text::JTextComponent * getComponent();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-private:
-  void installFixedDefaults();
-public: // actually protected
-  virtual void installListeners();
-  virtual ::java::lang::String * getKeymapName();
-  virtual ::javax::swing::text::Keymap * createKeymap();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createActionMap();
-  ::javax::swing::InputMap * getInputMap();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-private:
-  void uninstallFixedDefaults();
-public: // actually protected
-  virtual void uninstallListeners();
-  virtual void uninstallKeyboardActions();
-  virtual ::java::lang::String * getPropertyPrefix() = 0;
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintSafely(::java::awt::Graphics *);
-  virtual void paintBackground(::java::awt::Graphics *);
-public:
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint);
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *);
-  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *);
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint);
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *, jint, jint);
-public: // actually protected
-  virtual ::java::awt::Rectangle * getVisibleEditorRect();
-  virtual void setView(::javax::swing::text::View *);
-  virtual void modelChanged();
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-private:
-  static ::java::awt::event::FocusListener * focusListener;
-  static ::javax::swing::text::EditorKit * kit;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTextUI$Handler * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TextUI)))) handler;
-  ::javax::swing::plaf::basic::BasicTextUI$RootView * rootView;
-  ::javax::swing::text::JTextComponent * textComponent;
-private:
-  ::java::awt::Insets * cachedInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
deleted file mode 100644
index 45a77348c9a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToggleButtonUI__
-#define __javax_swing_plaf_basic_BasicToggleButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicToggleButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToggleButtonUI : public ::javax::swing::plaf::basic::BasicButtonUI
-{
-
-public:
-  BasicToggleButtonUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintIcon(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToggleButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
deleted file mode 100644
index a277f3293bd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
-#define __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JSeparator;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicToolBarSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
-{
-
-public:
-  BasicToolBarSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JSeparator *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-private:
-  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSeparatorUI)))) size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
deleted file mode 100644
index 36511145a51..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToolBar;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$DockingListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$DockingListener : public ::java::lang::Object
-{
-
-public:
-  BasicToolBarUI$DockingListener(::javax::swing::plaf::basic::BasicToolBarUI *, ::javax::swing::JToolBar *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isDragging;
-  ::java::awt::Point * origin;
-  ::javax::swing::JToolBar * toolBar;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
deleted file mode 100644
index 0545be03f3f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
-#define __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
-
-#pragma interface
-
-#include <java/awt/Window.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Insets;
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$DragWindow;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$DragWindow : public ::java::awt::Window
-{
-
-public: // actually package-private
-  BasicToolBarUI$DragWindow(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual ::java::awt::Color * getBorderColor();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Point * getOffset();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void setBorderColor(::java::awt::Color *);
-  virtual void setOffset(::java::awt::Point *);
-  virtual void setOrientation(jint);
-private:
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::awt::Window)))) borderColor;
-  ::java::awt::Point * offset;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
deleted file mode 100644
index 6041d7403fa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
-
-#pragma interface
-
-#include <java/awt/event/WindowAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$FrameListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$FrameListener : public ::java::awt::event::WindowAdapter
-{
-
-public: // actually protected
-  BasicToolBarUI$FrameListener(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual void windowClosing(::java::awt::event::WindowEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
deleted file mode 100644
index 39dafa84aba..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$PropertyListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$PropertyListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicToolBarUI$PropertyListener(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
deleted file mode 100644
index ff10a58dd0a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI$ToolBarAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicToolBarUI$ToolBarAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
deleted file mode 100644
index bcdc5378b59..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI$ToolBarBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarBorder : public ::java::lang::Object
-{
-
-  BasicToolBarUI$ToolBarBorder();
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-private:
-  void paintBumps(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *);
-public:
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static const jint offset = 10;
-  static const jint regular = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
deleted file mode 100644
index 0b5d6690dbb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$ToolBarContListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicToolBarUI$ToolBarContListener(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
deleted file mode 100644
index b7ee7b89fdc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
-
-#pragma interface
-
-#include <javax/swing/JDialog.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$ToolBarDialog;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarDialog : public ::javax::swing::JDialog
-{
-
-public:
-  BasicToolBarUI$ToolBarDialog(::javax::swing::plaf::basic::BasicToolBarUI *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::JDialog)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
deleted file mode 100644
index 4b5f7de7228..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$ToolBarFocusListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarFocusListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicToolBarUI$ToolBarFocusListener(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
deleted file mode 100644
index 3b3c1497818..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
+++ /dev/null
@@ -1,170 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI__
-#define __javax_swing_plaf_basic_BasicToolBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ToolBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Container;
-        class Dimension;
-        class Point;
-        class Window;
-      namespace event
-      {
-          class ContainerListener;
-          class FocusListener;
-          class WindowListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class JComponent;
-        class JFrame;
-        class JToolBar;
-        class KeyStroke;
-        class RootPaneContainer;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$DragWindow;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI : public ::javax::swing::plaf::ToolBarUI
-{
-
-public:
-  BasicToolBarUI();
-  virtual jboolean canDock(::java::awt::Component *, ::java::awt::Point *);
-private:
-  jint areaOfClick(::java::awt::Component *, ::java::awt::Point *);
-public: // actually protected
-  virtual ::javax::swing::event::MouseInputListener * createDockingListener();
-  virtual ::javax::swing::plaf::basic::BasicToolBarUI$DragWindow * createDragWindow(::javax::swing::JToolBar *);
-  virtual ::javax::swing::JFrame * createFloatingFrame(::javax::swing::JToolBar *);
-  virtual ::javax::swing::RootPaneContainer * createFloatingWindow(::javax::swing::JToolBar *);
-  virtual ::java::awt::event::WindowListener * createFrameListener();
-  virtual ::javax::swing::border::Border * createNonRolloverBorder();
-  virtual ::java::beans::PropertyChangeListener * createPropertyListener();
-  virtual ::javax::swing::border::Border * createRolloverBorder();
-  virtual ::java::awt::event::ContainerListener * createToolBarContListener();
-  virtual ::java::awt::event::FocusListener * createToolBarFocusListener();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void dragTo(::java::awt::Point *, ::java::awt::Point *);
-  virtual void floatAt(::java::awt::Point *, ::java::awt::Point *);
-public:
-  virtual ::java::awt::Color * getDockingColor();
-  virtual ::java::awt::Color * getFloatingColor();
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installComponents();
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public: // actually protected
-  virtual void installListeners();
-  virtual void installNonRolloverBorders(::javax::swing::JComponent *);
-  virtual void installNormalBorders(::javax::swing::JComponent *);
-  virtual void installRolloverBorders(::javax::swing::JComponent *);
-private:
-  void fillHashtable();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual jboolean isFloating();
-  virtual jboolean isRolloverBorders();
-public: // actually protected
-  virtual void navigateFocusedComp(jint);
-  virtual void setBorderToNonRollover(::java::awt::Component *);
-  virtual void setBorderToNormal(::java::awt::Component *);
-  virtual void setBorderToRollover(::java::awt::Component *);
-public:
-  virtual void setDockingColor(::java::awt::Color *);
-  virtual void setFloating(jboolean, ::java::awt::Point *);
-  virtual void setFloatingColor(::java::awt::Color *);
-  virtual void setFloatingLocation(jint, jint);
-  virtual void setOrientation(jint);
-  virtual void setRolloverBorders(jboolean);
-public: // actually protected
-  virtual void uninstallComponents();
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually package-private
-  static ::javax::swing::JFrame * owner;
-private:
-  static ::javax::swing::border::Border * nonRolloverBorder;
-  static ::javax::swing::border::Border * rolloverBorder;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolBarUI)))) constraintBeforeFloating;
-public: // actually package-private
-  jint lastGoodOrientation;
-public: // actually protected
-  ::java::awt::Color * dockingBorderColor;
-  ::java::awt::Color * dockingColor;
-  ::javax::swing::event::MouseInputListener * dockingListener;
-  ::javax::swing::plaf::basic::BasicToolBarUI$DragWindow * dragWindow;
-  ::java::awt::Color * floatingBorderColor;
-  ::java::awt::Color * floatingColor;
-  jint focusedCompIndex;
-  ::java::beans::PropertyChangeListener * propertyListener;
-  ::javax::swing::JToolBar * toolBar;
-  ::java::awt::event::ContainerListener * toolBarContListener;
-  ::java::awt::event::FocusListener * toolBarFocusListener;
-  ::javax::swing::KeyStroke * leftKey;
-  ::javax::swing::KeyStroke * rightKey;
-  ::javax::swing::KeyStroke * upKey;
-  ::javax::swing::KeyStroke * downKey;
-private:
-  ::java::awt::Window * floatFrame;
-public: // actually package-private
-  ::java::awt::Container * origParent;
-  ::java::util::Hashtable * borders;
-private:
-  ::java::awt::event::WindowListener * windowListener;
-public: // actually package-private
-  ::java::awt::Dimension * cachedBounds;
-  jint cachedOrientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
deleted file mode 100644
index 9bc19d1ba82..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolTipUI;
-            class BasicToolTipUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolTipUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicToolTipUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicToolTipUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicToolTipUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicToolTipUI *, ::javax::swing::plaf::basic::BasicToolTipUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicToolTipUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolTipUI.h b/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
deleted file mode 100644
index a204e00e1e1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolTipUI__
-#define __javax_swing_plaf_basic_BasicToolTipUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ToolTipUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicToolTipUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolTipUI : public ::javax::swing::plaf::ToolTipUI
-{
-
-public:
-  BasicToolTipUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JComponent *);
-  virtual void installListeners(::javax::swing::JComponent *);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults(::javax::swing::JComponent *);
-  virtual void uninstallListeners(::javax::swing::JComponent *);
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-private:
-  static ::javax::swing::plaf::basic::BasicToolTipUI * shared;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolTipUI)))) text;
-  ::java::beans::PropertyChangeListener * propertyChangeHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolTipUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
deleted file mode 100644
index 3578f4779d8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$1__
-#define __javax_swing_plaf_basic_BasicTreeUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTreeUI$1(::javax::swing::plaf::basic::BasicTreeUI *);
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
deleted file mode 100644
index 07bc329e3c3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$CellEditorHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$CellEditorHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$CellEditorHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
deleted file mode 100644
index ec6d8185735..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
-
-#pragma interface
-
-#include <java/awt/event/ComponentAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollPane;
-        class Timer;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$ComponentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
-{
-
-public:
-  BasicTreeUI$ComponentHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-public: // actually protected
-  virtual void startTimer();
-  virtual ::javax::swing::JScrollPane * getScrollPane();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) timer;
-  ::javax::swing::JScrollBar * scrollBar;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
deleted file mode 100644
index 232e989a2e9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$FocusHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  virtual void repaintLeadRow();
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
deleted file mode 100644
index 2be990a8ea5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
-
-#pragma interface
-
-#include <java/awt/event/KeyAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$KeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$KeyHandler : public ::java::awt::event::KeyAdapter
-{
-
-public:
-  BasicTreeUI$KeyHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void keyTyped(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  virtual jboolean checkMatch(jint, jchar);
-public:
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-public: // actually protected
-  ::javax::swing::Action * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) repeatKeyAction;
-  jboolean isKeyDown;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
deleted file mode 100644
index 2a0893ba233..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$MouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$MouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  BasicTreeUI$MouseHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-private:
-  void handleEvent(::java::awt::event::MouseEvent *);
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) selectedOnPress;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
deleted file mode 100644
index 574d8b56a50..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTreeUI *, ::java::awt::Component *, ::java::awt::Component *, ::java::awt::event::MouseEvent *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually protected
-  virtual void removeFromSource();
-private:
-  void dispatch(::java::awt::event::MouseEvent *);
-public: // actually protected
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) source;
-  ::java::awt::Component * destination;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
deleted file mode 100644
index 352a37067cd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
-
-#pragma interface
-
-#include <javax/swing/tree/AbstractLayoutCache$NodeDimensions.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$NodeDimensionsHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$NodeDimensionsHandler : public ::javax::swing::tree::AbstractLayoutCache$NodeDimensions
-{
-
-public:
-  BasicTreeUI$NodeDimensionsHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *);
-public: // actually protected
-  virtual jint getRowX(jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::tree::AbstractLayoutCache$NodeDimensions)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
deleted file mode 100644
index 54386de9cbd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
deleted file mode 100644
index 52b52d1c375..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$SelectionModelPropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$SelectionModelPropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$SelectionModelPropertyChangeHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
deleted file mode 100644
index b64ba698eda..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeCancelEditingAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeCancelEditingAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeCancelEditingAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
deleted file mode 100644
index 52ba7c8bb1f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeExpansionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeExpansionHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$TreeExpansionHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *);
-  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
deleted file mode 100644
index 1b25c11646c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeHomeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeHomeAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeHomeAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
deleted file mode 100644
index 03ed852179e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeIncrementAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeIncrementAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeIncrementAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
deleted file mode 100644
index 9ea52685087..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeModelHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeModelHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$TreeModelHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
deleted file mode 100644
index 5cb1725d4fd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreePageAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreePageAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreePageAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
deleted file mode 100644
index 73ff33b1c15..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeSelectionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeSelectionHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$TreeSelectionHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
deleted file mode 100644
index fa01f97ddbf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeStartEditingAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeStartEditingAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeStartEditingAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
deleted file mode 100644
index 59b5c5e2ea6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeToggleAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeToggleAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeToggleAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
deleted file mode 100644
index 617dbd65299..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeTraverseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeTraverseAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeTraverseAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI.h b/libjava/javax/swing/plaf/basic/BasicTreeUI.h
deleted file mode 100644
index 42159f13bc7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI.h
+++ /dev/null
@@ -1,279 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI__
-#define __javax_swing_plaf_basic_BasicTreeUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TreeUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-      namespace event
-      {
-          class ComponentListener;
-          class FocusListener;
-          class KeyListener;
-          class MouseEvent;
-          class MouseListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class CellRendererPane;
-        class Icon;
-        class JComponent;
-        class JTree;
-      namespace event
-      {
-          class CellEditorListener;
-          class TreeExpansionListener;
-          class TreeModelListener;
-          class TreeSelectionListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTreeUI;
-        }
-      }
-      namespace tree
-      {
-          class AbstractLayoutCache;
-          class AbstractLayoutCache$NodeDimensions;
-          class TreeCellEditor;
-          class TreeCellRenderer;
-          class TreeModel;
-          class TreePath;
-          class TreeSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI : public ::javax::swing::plaf::TreeUI
-{
-
-public:
-  BasicTreeUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Color * getHashColor();
-  virtual void setHashColor(::java::awt::Color *);
-public:
-  virtual void setLeftChildIndent(jint);
-  virtual jint getLeftChildIndent();
-  virtual void setRightChildIndent(jint);
-  virtual jint getRightChildIndent();
-  virtual void setExpandedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getExpandedIcon();
-  virtual void setCollapsedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getCollapsedIcon();
-public: // actually protected
-  virtual void setLargeModel(jboolean);
-  virtual jboolean isLargeModel();
-  virtual void setRowHeight(jint);
-  virtual jint getRowHeight();
-  virtual void setCellRenderer(::javax::swing::tree::TreeCellRenderer *);
-  virtual ::javax::swing::tree::TreeCellRenderer * getCellRenderer();
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual ::javax::swing::tree::TreeModel * getModel();
-  virtual void setRootVisible(jboolean);
-  virtual jboolean isRootVisible();
-  virtual void setShowsRootHandles(jboolean);
-  virtual jboolean getShowsRootHandles();
-  virtual void setCellEditor(::javax::swing::tree::TreeCellEditor *);
-  virtual ::javax::swing::tree::TreeCellEditor * getCellEditor();
-  virtual void setEditable(jboolean);
-  virtual jboolean isEditable();
-  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
-  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
-public:
-  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-public: // actually package-private
-  virtual jint getMaxHeight(::javax::swing::JTree *);
-  virtual ::javax::swing::Icon * getNodeIcon(::javax::swing::tree::TreePath *);
-public:
-  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint);
-  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual jint getRowCount(::javax::swing::JTree *);
-  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint);
-  virtual jboolean isEditing(::javax::swing::JTree *);
-  virtual jboolean stopEditing(::javax::swing::JTree *);
-  virtual void cancelEditing(::javax::swing::JTree *);
-  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *);
-public: // actually protected
-  virtual void prepareForUIInstall();
-  virtual void completeUIInstall();
-  virtual void completeUIUninstall();
-  virtual void installComponents();
-  virtual ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * createNodeDimensions();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::event::MouseListener * createMouseListener();
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::java::awt::event::KeyListener * createKeyListener();
-  virtual ::java::beans::PropertyChangeListener * createSelectionModelPropertyChangeListener();
-  virtual ::javax::swing::event::TreeSelectionListener * createTreeSelectionListener();
-  virtual ::javax::swing::event::CellEditorListener * createCellEditorListener();
-  virtual ::java::awt::event::ComponentListener * createComponentListener();
-  virtual ::javax::swing::event::TreeExpansionListener * createTreeExpansionListener();
-  virtual ::javax::swing::tree::AbstractLayoutCache * createLayoutCache();
-  virtual ::javax::swing::CellRendererPane * createCellRendererPane();
-  virtual ::javax::swing::tree::TreeCellEditor * createDefaultCellEditor();
-  virtual ::javax::swing::tree::TreeCellRenderer * createDefaultCellRenderer();
-  virtual ::javax::swing::event::TreeModelListener * createTreeModelListener();
-  virtual void uninstallListeners();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallComponents();
-  virtual jint getVerticalLegBuffer();
-  virtual jint getHorizontalLegBuffer();
-  virtual void updateLayoutCacheExpandedNodes();
-  virtual void updateExpandedDescendants(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getLastChildPath(::javax::swing::tree::TreePath *);
-  virtual void updateDepthOffset();
-  virtual void updateCellEditor();
-  virtual void updateRenderer();
-  virtual void configureLayoutCache();
-  virtual void updateSize();
-  virtual void updateCachedPreferredSize();
-  virtual void pathWasExpanded(::javax::swing::tree::TreePath *);
-  virtual void pathWasCollapsed(::javax::swing::tree::TreePath *);
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-  jint convertModifiers(jint);
-public: // actually protected
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  jboolean isLastChild(::javax::swing::tree::TreePath *);
-public: // actually protected
-  virtual void ensureRowsAreVisible(jint, jint);
-public:
-  virtual void setPreferredMinSize(::java::awt::Dimension *);
-  virtual ::java::awt::Dimension * getPreferredMinSize();
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *, jboolean);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void completeEditing();
-  virtual void completeEditing(jboolean, jboolean, jboolean);
-  virtual jboolean startEditing(::javax::swing::tree::TreePath *, ::java::awt::event::MouseEvent *);
-private:
-  void editorRequestFocus(::java::awt::Component *);
-public: // actually protected
-  virtual void checkForClickInExpandControl(::javax::swing::tree::TreePath *, jint, jint);
-  virtual jboolean isLocationInExpandControl(::javax::swing::tree::TreePath *, jint, jint);
-  virtual void handleExpandControlClick(::javax::swing::tree::TreePath *, jint, jint);
-  virtual void toggleExpandState(::javax::swing::tree::TreePath *);
-  virtual jboolean isToggleSelectionEvent(::java::awt::event::MouseEvent *);
-  virtual jboolean isMultiSelectEvent(::java::awt::event::MouseEvent *);
-  virtual jboolean isToggleEvent(::java::awt::event::MouseEvent *);
-  virtual void selectPathForEvent(::javax::swing::tree::TreePath *, ::java::awt::event::MouseEvent *);
-  virtual jboolean isLeaf(jint);
-public: // actually package-private
-  virtual jboolean hasControlIcons();
-  virtual ::javax::swing::Icon * getCurrentControlIcon(::javax::swing::tree::TreePath *);
-  virtual ::java::lang::Object * getParent(::java::lang::Object *, ::java::lang::Object *);
-private:
-  ::java::lang::Object * findNode(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  virtual void selectPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual JArray< ::java::lang::Object * > * getPathToRoot(::java::lang::Object *, jint);
-public: // actually protected
-  virtual void paintVerticalLine(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint);
-  virtual void paintHorizontalLine(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint);
-  virtual void drawCentered(::java::awt::Component *, ::java::awt::Graphics *, ::javax::swing::Icon *, jint, jint);
-  virtual void drawDashedHorizontalLine(::java::awt::Graphics *, jint, jint, jint);
-  virtual void drawDashedVerticalLine(::java::awt::Graphics *, jint, jint, jint);
-  virtual void paintExpandControl(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-  virtual void paintHorizontalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-  virtual void paintVerticalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::javax::swing::tree::TreePath *);
-  virtual void paintRow(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-  virtual void prepareForUIUninstall();
-  virtual jboolean shouldPaintExpandControl(::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-  virtual jint getRowX(jint, jint);
-public: // actually package-private
-  static jint WAIT_TILL_EDITING;
-public: // actually protected
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TreeUI)))) collapsedIcon;
-  ::javax::swing::Icon * expandedIcon;
-  jint leftChildIndent;
-  jint rightChildIndent;
-  jint totalChildIndent;
-  jint lastSelectedRow;
-  ::javax::swing::JTree * tree;
-  ::javax::swing::tree::TreeCellRenderer * currentCellRenderer;
-  jboolean createdRenderer;
-  ::javax::swing::tree::TreeCellEditor * cellEditor;
-  jboolean createdCellEditor;
-  jboolean stopEditingInCompleteEditing;
-  ::javax::swing::CellRendererPane * rendererPane;
-  ::java::awt::Dimension * preferredSize;
-  ::java::awt::Dimension * preferredMinSize;
-  jboolean validCachedPreferredSize;
-  ::javax::swing::tree::AbstractLayoutCache * treeState;
-  ::java::util::Hashtable * drawingCache;
-  jboolean largeModel;
-  ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * nodeDimensions;
-  ::javax::swing::tree::TreeModel * treeModel;
-  ::javax::swing::tree::TreeSelectionModel * treeSelectionModel;
-  jint depthOffset;
-  ::java::awt::Component * editingComponent;
-  ::javax::swing::tree::TreePath * editingPath;
-  jint editingRow;
-  jboolean editorHasDifferentSize;
-public: // actually package-private
-  jboolean isEditing__;
-  ::javax::swing::tree::TreePath * currentVisiblePath;
-  jint gap;
-  jint maxHeight;
-  ::java::awt::Color * hashColor;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::java::awt::event::FocusListener * focusListener;
-  ::javax::swing::event::TreeSelectionListener * treeSelectionListener;
-  ::java::awt::event::MouseListener * mouseListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::java::beans::PropertyChangeListener * selectionModelPropertyChangeListener;
-  ::java::awt::event::ComponentListener * componentListener;
-  ::javax::swing::event::CellEditorListener * cellEditorListener;
-  ::javax::swing::event::TreeExpansionListener * treeExpansionListener;
-  ::javax::swing::event::TreeModelListener * treeModelListener;
-  static ::javax::swing::Icon * nullIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicViewportUI.h b/libjava/javax/swing/plaf/basic/BasicViewportUI.h
deleted file mode 100644
index f657f7dc098..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicViewportUI.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicViewportUI__
-#define __javax_swing_plaf_basic_BasicViewportUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ViewportUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicViewportUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicViewportUI : public ::javax::swing::plaf::ViewportUI
-{
-
-public:
-  BasicViewportUI();
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JComponent *);
-  virtual void uninstallDefaults(::javax::swing::JComponent *);
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicViewportUI__
diff --git a/libjava/javax/swing/plaf/basic/ComboPopup.h b/libjava/javax/swing/plaf/basic/ComboPopup.h
deleted file mode 100644
index 9f01bedb340..00000000000
--- a/libjava/javax/swing/plaf/basic/ComboPopup.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_ComboPopup__
-#define __javax_swing_plaf_basic_ComboPopup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyListener;
-          class MouseListener;
-          class MouseMotionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class ComboPopup;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::ComboPopup : public ::java::lang::Object
-{
-
-public:
-  virtual void show() = 0;
-  virtual void hide() = 0;
-  virtual jboolean isVisible() = 0;
-  virtual ::javax::swing::JList * getList() = 0;
-  virtual ::java::awt::event::MouseListener * getMouseListener() = 0;
-  virtual ::java::awt::event::MouseMotionListener * getMouseMotionListener() = 0;
-  virtual ::java::awt::event::KeyListener * getKeyListener() = 0;
-  virtual void uninstallingUI() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_plaf_basic_ComboPopup__
diff --git a/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h b/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
deleted file mode 100644
index 15b06f2a807..00000000000
--- a/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_DefaultMenuLayout__
-#define __javax_swing_plaf_basic_DefaultMenuLayout__
-
-#pragma interface
-
-#include <javax/swing/BoxLayout.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class DefaultMenuLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::DefaultMenuLayout : public ::javax::swing::BoxLayout
-{
-
-public:
-  DefaultMenuLayout(::java::awt::Container *, jint);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_DefaultMenuLayout__
diff --git a/libjava/javax/swing/plaf/basic/SharedUIDefaults.h b/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
deleted file mode 100644
index 7db5a2f3b50..00000000000
--- a/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_SharedUIDefaults__
-#define __javax_swing_plaf_basic_SharedUIDefaults__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class SharedUIDefaults;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::SharedUIDefaults : public ::java::lang::Object
-{
-
-public:
-  SharedUIDefaults();
-public: // actually package-private
-  static ::java::lang::Object * get(::java::lang::String *);
-  static ::java::awt::Color * getColor(::java::lang::String *);
-private:
-  static ::java::util::HashMap * sharedDefaults;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_SharedUIDefaults__
diff --git a/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h b/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h
deleted file mode 100644
index 8ce9a8c1b5a..00000000000
--- a/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_DefaultMetalTheme__
-#define __javax_swing_plaf_metal_DefaultMetalTheme__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalTheme.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ColorUIResource;
-          class FontUIResource;
-        namespace metal
-        {
-            class DefaultMetalTheme;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::DefaultMetalTheme : public ::javax::swing::plaf::metal::MetalTheme
-{
-
-public:
-  DefaultMetalTheme();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
-public:
-  virtual ::javax::swing::plaf::FontUIResource * getControlTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getMenuTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getSubTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getSystemTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getUserTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getWindowTitleFont();
-private:
-  ::javax::swing::plaf::FontUIResource * getFont(jint);
-  jboolean isBoldMetal();
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY1;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY2;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY3;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY1;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY2;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY3;
-  static ::javax::swing::plaf::FontUIResource * SUB_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * SYSTEM_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * USER_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * WINDOW_TITLE_FONT;
-  static ::javax::swing::plaf::FontUIResource * PLAIN_CONTROL_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * BOLD_CONTROL_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * PLAIN_MENU_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * BOLD_MENU_TEXT_FONT;
-public: // actually package-private
-  static const jint CONTROL_TEXT_FONT = 1;
-  static const jint MENU_TEXT_FONT = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_DefaultMetalTheme__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h
deleted file mode 100644
index 23e18daddbb..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
-#define __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$ButtonBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$ButtonBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  void paintDefaultButtonBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  void paintOceanButtonBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h
deleted file mode 100644
index ba3739cf631..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
-#define __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$DesktopIconBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$DesktopIconBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$DesktopIconBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h
deleted file mode 100644
index be51edc5bf1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
-#define __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$Flush3DBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$Flush3DBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$Flush3DBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h
deleted file mode 100644
index e85132faef8..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
-#define __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$InternalFrameBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$InternalFrameBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$InternalFrameBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h
deleted file mode 100644
index b42e516e8fb..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
-#define __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$MenuBarBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$MenuBarBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$MenuBarBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h
deleted file mode 100644
index b339b8758bb..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
-#define __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$MenuItemBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$MenuItemBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$MenuItemBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h
deleted file mode 100644
index 1a04e67ec7e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
-#define __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$OptionDialogBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$OptionDialogBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$OptionDialogBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h
deleted file mode 100644
index 853bd4cef7c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
-#define __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$PaletteBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$PaletteBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$PaletteBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h
deleted file mode 100644
index cc66966b672..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
-#define __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$PopupMenuBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$PopupMenuBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$PopupMenuBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h
deleted file mode 100644
index e34c0cf372e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
-#define __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$RolloverButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$RolloverButtonBorder : public ::javax::swing::plaf::metal::MetalBorders$ButtonBorder
-{
-
-public:
-  MetalBorders$RolloverButtonBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h
deleted file mode 100644
index 78e6c4f00c1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
-#define __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$RolloverMarginBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$RolloverMarginBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$RolloverMarginBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h
deleted file mode 100644
index d6baf243933..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
-#define __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ScrollPaneBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$ScrollPaneBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$ScrollPaneBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static ::java::awt::Insets * insets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h
deleted file mode 100644
index 94874119183..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
-#define __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$TableHeaderBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$TableHeaderBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$TableHeaderBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually protected
-  ::java::awt::Insets * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) editorBorderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h
deleted file mode 100644
index de1e4e7d864..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
-#define __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$TextFieldBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$TextFieldBorder : public ::javax::swing::plaf::metal::MetalBorders$Flush3DBorder
-{
-
-public:
-  MetalBorders$TextFieldBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h
deleted file mode 100644
index 6d9f3de5c03..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
-#define __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ToggleButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$ToggleButtonBorder : public ::javax::swing::plaf::metal::MetalBorders$ButtonBorder
-{
-
-public:
-  MetalBorders$ToggleButtonBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h
deleted file mode 100644
index da97e79e506..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
-#define __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ToolBarBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$ToolBarBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$ToolBarBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders.h b/libjava/javax/swing/plaf/metal/MetalBorders.h
deleted file mode 100644
index 63101bfb525..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders__
-#define __javax_swing_plaf_metal_MetalBorders__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$MarginBorder;
-        }
-        namespace metal
-        {
-            class MetalBorders;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders : public ::java::lang::Object
-{
-
-public:
-  MetalBorders();
-  static ::javax::swing::border::Border * getButtonBorder();
-  static ::javax::swing::border::Border * getToggleButtonBorder();
-  static ::javax::swing::border::Border * getDesktopIconBorder();
-  static ::javax::swing::border::Border * getTextFieldBorder();
-  static ::javax::swing::border::Border * getTextBorder();
-public: // actually package-private
-  static ::javax::swing::border::Border * getToolbarButtonBorder();
-  static ::javax::swing::border::Border * getMarginBorder();
-  static ::javax::swing::border::Border * getRolloverBorder();
-private:
-  static ::javax::swing::border::Border * buttonBorder;
-  static ::javax::swing::border::Border * toggleButtonBorder;
-  static ::javax::swing::border::Border * desktopIconBorder;
-  static ::javax::swing::border::Border * toolbarButtonBorder;
-  static ::javax::swing::border::Border * textFieldBorder;
-  static ::javax::swing::border::Border * textBorder;
-  static ::javax::swing::border::Border * rolloverBorder;
-  static ::javax::swing::plaf::basic::BasicBorders$MarginBorder * marginBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders__
diff --git a/libjava/javax/swing/plaf/metal/MetalButtonListener.h b/libjava/javax/swing/plaf/metal/MetalButtonListener.h
deleted file mode 100644
index 0beeef1718a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalButtonListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalButtonListener__
-#define __javax_swing_plaf_metal_MetalButtonListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicButtonListener.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalButtonListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalButtonListener : public ::javax::swing::plaf::basic::BasicButtonListener
-{
-
-public:
-  MetalButtonListener(::javax::swing::AbstractButton *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalButtonListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalButtonUI.h b/libjava/javax/swing/plaf/metal/MetalButtonUI.h
deleted file mode 100644
index d2e6ced26a1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalButtonUI.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalButtonUI__
-#define __javax_swing_plaf_metal_MetalButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalButtonUI : public ::javax::swing::plaf::basic::BasicButtonUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  MetalButtonUI();
-public: // actually protected
-  virtual ::java::awt::Color * getFocusColor();
-  virtual ::java::awt::Color * getSelectColor();
-  virtual ::java::awt::Color * getDisabledTextColor();
-public:
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
-public: // actually protected
-  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
-  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
-public:
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  jboolean isToolbarButton(::java::awt::Component *);
-  jboolean isDrawingGradient(::java::lang::String *);
-  static ::javax::swing::plaf::metal::MetalButtonUI * sharedUI;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicButtonUI)))) focusColor;
-  ::java::awt::Color * selectColor;
-  ::java::awt::Color * disabledTextColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h b/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h
deleted file mode 100644
index b30ae97ba21..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalCheckBoxIcon__
-#define __javax_swing_plaf_metal_MetalCheckBoxIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ButtonBorder;
-            class MetalCheckBoxIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalCheckBoxIcon : public ::java::lang::Object
-{
-
-public:
-  MetalCheckBoxIcon();
-public: // actually protected
-  virtual void drawCheck(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual jint getControlSize();
-public:
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalBorders$ButtonBorder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) border;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalCheckBoxIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h b/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h
deleted file mode 100644
index fff6cd27ef1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalCheckBoxUI__
-#define __javax_swing_plaf_metal_MetalCheckBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalRadioButtonUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalCheckBoxUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalCheckBoxUI : public ::javax::swing::plaf::metal::MetalRadioButtonUI
-{
-
-public:
-  MetalCheckBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::lang::String * getPropertyPrefix();
-private:
-  static ::javax::swing::plaf::metal::MetalCheckBoxUI * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalCheckBoxUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h b/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h
deleted file mode 100644
index 000e755fbe0..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxButton__
-#define __javax_swing_plaf_metal_MetalComboBoxButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class CellRendererPane;
-        class Icon;
-        class JComboBox;
-        class JList;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxButton : public ::javax::swing::JButton
-{
-
-public:
-  MetalComboBoxButton(::javax::swing::JComboBox *, ::javax::swing::Icon *, ::javax::swing::CellRendererPane *, ::javax::swing::JList *);
-  MetalComboBoxButton(::javax::swing::JComboBox *, ::javax::swing::Icon *, jboolean, ::javax::swing::CellRendererPane *, ::javax::swing::JList *);
-  virtual ::javax::swing::JComboBox * getComboBox();
-  virtual void setComboBox(::javax::swing::JComboBox *);
-  virtual ::javax::swing::Icon * getComboIcon();
-  virtual void setComboIcon(::javax::swing::Icon *);
-  virtual jboolean isIconOnly();
-  virtual void setIconOnly(jboolean);
-  virtual jboolean isFocusTraversable();
-  virtual void setEnabled(jboolean);
-  virtual void paintComponent(::java::awt::Graphics *);
-public: // actually protected
-  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) comboBox;
-  ::javax::swing::JList * listBox;
-  ::javax::swing::CellRendererPane * rendererPane;
-  ::javax::swing::Icon * comboIcon;
-  jboolean iconOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h
deleted file mode 100644
index 501e1386457..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
-#define __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxEditor;
-            class MetalComboBoxEditor$EditorTextField;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxEditor$EditorTextField : public ::javax::swing::JTextField
-{
-
-public: // actually package-private
-  MetalComboBoxEditor$EditorTextField(::javax::swing::plaf::metal::MetalComboBoxEditor *, ::java::lang::String *, jint);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalComboBoxEditor * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h
deleted file mode 100644
index 4f8166c503b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
-#define __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxEditor$MetalComboBoxEditorBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxEditor$MetalComboBoxEditorBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalComboBoxEditor$MetalComboBoxEditorBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h
deleted file mode 100644
index edf8097d42d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
-#define __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalComboBoxEditor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxEditor$UIResource;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxEditor$UIResource : public ::javax::swing::plaf::metal::MetalComboBoxEditor
-{
-
-public:
-  MetalComboBoxEditor$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h
deleted file mode 100644
index 89d3edfe4af..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor__
-#define __javax_swing_plaf_metal_MetalComboBoxEditor__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxEditor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxEditor;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxEditor : public ::javax::swing::plaf::basic::BasicComboBoxEditor
-{
-
-public:
-  MetalComboBoxEditor();
-public: // actually protected
-  static ::java::awt::Insets * editorBorderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxEditor__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h b/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h
deleted file mode 100644
index a51d9aa3cf4..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxIcon__
-#define __javax_swing_plaf_metal_MetalComboBoxIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxIcon : public ::java::lang::Object
-{
-
-public:
-  MetalComboBoxIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h
deleted file mode 100644
index d2a909c445d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
-#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxUI;
-            class MetalComboBoxUI$MetalComboBoxLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxUI$MetalComboBoxLayoutManager : public ::javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager
-{
-
-public:
-  MetalComboBoxUI$MetalComboBoxLayoutManager(::javax::swing::plaf::metal::MetalComboBoxUI *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual void superLayout(::java::awt::Container *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h
deleted file mode 100644
index ac9789ff0d2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
-#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboPopup.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComboBox;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxUI;
-            class MetalComboBoxUI$MetalComboPopup;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxUI$MetalComboPopup : public ::javax::swing::plaf::basic::BasicComboPopup
-{
-
-public:
-  MetalComboBoxUI$MetalComboPopup(::javax::swing::plaf::metal::MetalComboBoxUI *, ::javax::swing::JComboBox *);
-  virtual void delegateFocus(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboPopup)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h
deleted file mode 100644
index fee1da1a459..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
-#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxUI;
-            class MetalComboBoxUI$MetalPropertyChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxUI$MetalPropertyChangeListener : public ::javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler
-{
-
-public:
-  MetalComboBoxUI$MetalPropertyChangeListener(::javax::swing::plaf::metal::MetalComboBoxUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h
deleted file mode 100644
index 047d1442b05..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxUI__
-#define __javax_swing_plaf_metal_MetalComboBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Dimension;
-        class Graphics;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxEditor;
-        class JButton;
-        class JComboBox;
-        class JComponent;
-        class JList;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class ComboPopup;
-        }
-        namespace metal
-        {
-            class MetalComboBoxUI;
-            class MetalComboBoxUI$MetalComboBoxLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxUI : public ::javax::swing::plaf::basic::BasicComboBoxUI
-{
-
-public:
-  MetalComboBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::javax::swing::ComboBoxEditor * createEditor();
-  virtual ::javax::swing::plaf::basic::ComboPopup * createPopup();
-  virtual ::javax::swing::JButton * createArrowButton();
-public:
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void editablePropertyChanged(::java::beans::PropertyChangeEvent *);
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual void removeListeners();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual void configureEditor();
-  virtual void unconfigureEditor();
-  virtual void layoutComboBox(::java::awt::Container *, ::javax::swing::plaf::metal::MetalComboBoxUI$MetalComboBoxLayoutManager *);
-public: // actually package-private
-  static ::javax::swing::JButton * access$0(::javax::swing::plaf::metal::MetalComboBoxUI *);
-  static ::javax::swing::JComboBox * access$1(::javax::swing::plaf::metal::MetalComboBoxUI *);
-  static ::javax::swing::JList * access$2(::javax::swing::plaf::metal::MetalComboBoxUI *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h b/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h
deleted file mode 100644
index 1b1de7b5776..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalDesktopIconUI__
-#define __javax_swing_plaf_metal_MetalDesktopIconUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicDesktopIconUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalDesktopIconUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalDesktopIconUI : public ::javax::swing::plaf::basic::BasicDesktopIconUI
-{
-
-public:
-  MetalDesktopIconUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h
deleted file mode 100644
index 9900aed3910..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$ButtonLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$ButtonLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$ButtonLayout(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  static const jint GAP = 4;
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h
deleted file mode 100644
index 92fac4ca2f9..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DetailViewActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$DetailViewActionListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$DetailViewActionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h
deleted file mode 100644
index da666e12989..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DirectoryComboBoxAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  MetalFileChooserUI$DirectoryComboBoxAction(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h
deleted file mode 100644
index 27a72e053e6..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DirectoryComboBoxModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel : public ::javax::swing::AbstractListModel
-{
-
-public:
-  MetalFileChooserUI$DirectoryComboBoxModel(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-  virtual jint getDepth(jint);
-  virtual ::java::lang::Object * getSelectedItem();
-  virtual void setSelectedItem(::java::lang::Object *);
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) items;
-  jint selectedIndex;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h
deleted file mode 100644
index 6e88691ae5b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
-
-#pragma interface
-
-#include <javax/swing/DefaultListCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-        class JList;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DirectoryComboBoxRenderer;
-            class MetalFileChooserUI$IndentIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxRenderer : public ::javax::swing::DefaultListCellRenderer
-{
-
-public:
-  MetalFileChooserUI$DirectoryComboBoxRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JFileChooser *);
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-private:
-  ::javax::swing::plaf::metal::MetalFileChooserUI$IndentIcon * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) indentIcon;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h
deleted file mode 100644
index 235c7c968c4..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
-
-#pragma interface
-
-#include <javax/swing/DefaultListCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$FileRenderer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$FileRenderer : public ::javax::swing::DefaultListCellRenderer
-{
-
-public: // actually protected
-  MetalFileChooserUI$FileRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h
deleted file mode 100644
index 48ce51fe151..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace filechooser
-      {
-          class FileFilter;
-      }
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$FilterComboBoxModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel : public ::javax::swing::AbstractListModel
-{
-
-public: // actually protected
-  MetalFileChooserUI$FilterComboBoxModel(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void setSelectedItem(::java::lang::Object *);
-  virtual ::java::lang::Object * getSelectedItem();
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-public: // actually protected
-  JArray< ::javax::swing::filechooser::FileFilter * > * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) filters;
-private:
-  ::java::lang::Object * selected;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h
deleted file mode 100644
index 60260fa49ce..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
-
-#pragma interface
-
-#include <javax/swing/DefaultListCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$FilterComboBoxRenderer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxRenderer : public ::javax::swing::DefaultListCellRenderer
-{
-
-public:
-  MetalFileChooserUI$FilterComboBoxRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h
deleted file mode 100644
index c1b25f6718c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$IndentIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$IndentIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$IndentIcon(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual void setDepth(jint);
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-private:
-  static const jint INDENT = 10;
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::java::lang::Object)))) icon;
-  jint depth;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h
deleted file mode 100644
index 79b8f71ef31..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$ListViewActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$ListViewActionListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$ListViewActionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h
deleted file mode 100644
index 7c0368ca90b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$MetalFileChooserPropertyChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$MetalFileChooserPropertyChangeListener : public ::java::lang::Object
-{
-
-public:
-  MetalFileChooserUI$MetalFileChooserPropertyChangeListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h
deleted file mode 100644
index 460f121b92e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$MetalFileChooserSelectionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$MetalFileChooserSelectionListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  MetalFileChooserUI$MetalFileChooserSelectionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h
deleted file mode 100644
index 02fe27e49dd..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI$SingleClickListener;
-            class MetalFileChooserUI$SingleClickListener$EditingActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener$EditingActionListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$SingleClickListener$EditingActionListener(::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h
deleted file mode 100644
index 66c7b0d10f0..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-        class JList;
-        class JTextField;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$SingleClickListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  MetalFileChooserUI$SingleClickListener(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JList *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void editFile(jint);
-  virtual void completeEditing();
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) list;
-  ::java::io::File * editFile__;
-  ::javax::swing::JFileChooser * fc;
-  ::java::lang::Object * lastSelected;
-  ::javax::swing::JTextField * editField;
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h
deleted file mode 100644
index bacd2d07e89..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI$TableClickListener;
-            class MetalFileChooserUI$TableClickListener$EditingActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener$EditingActionListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$TableClickListener$EditingActionListener(::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h
deleted file mode 100644
index 2e536e45637..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-        class JTable;
-        class JTextField;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$TableClickListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  MetalFileChooserUI$TableClickListener(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JTable *, ::javax::swing::JFileChooser *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void editFile(jint);
-  virtual void completeEditing();
-public:
-  virtual void closeDialog();
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) table;
-  ::javax::swing::JFileChooser * fc;
-  ::java::lang::Object * lastSelected;
-  ::java::io::File * editFile__;
-  ::javax::swing::JTextField * editField;
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h
deleted file mode 100644
index e5b5029f733..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$TableFileRenderer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$TableFileRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  MetalFileChooserUI$TableFileRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h
deleted file mode 100644
index 64f4be6c619..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$VerticalMidLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$VerticalMidLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$VerticalMidLayout(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h
deleted file mode 100644
index cf8ceae94e4..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h
+++ /dev/null
@@ -1,159 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI__
-#define __javax_swing_plaf_metal_MetalFileChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicFileChooserUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class MouseListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class JButton;
-        class JComboBox;
-        class JComponent;
-        class JFileChooser;
-        class JLabel;
-        class JList;
-        class JPanel;
-        class JScrollPane;
-        class JTable;
-        class JTextField;
-      namespace event
-      {
-          class ListSelectionEvent;
-          class ListSelectionListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DirectoryComboBoxModel;
-            class MetalFileChooserUI$DirectoryComboBoxRenderer;
-            class MetalFileChooserUI$FilterComboBoxModel;
-            class MetalFileChooserUI$FilterComboBoxRenderer;
-            class MetalFileChooserUI$SingleClickListener;
-            class MetalFileChooserUI$TableClickListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI : public ::javax::swing::plaf::basic::BasicFileChooserUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  MetalFileChooserUI(::javax::swing::JFileChooser *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void installComponents(::javax::swing::JFileChooser *);
-  virtual void uninstallComponents(::javax::swing::JFileChooser *);
-public: // actually protected
-  virtual ::javax::swing::JPanel * getButtonPanel();
-  virtual ::javax::swing::JPanel * getBottomPanel();
-  virtual void installStrings(::javax::swing::JFileChooser *);
-  virtual void installListeners(::javax::swing::JFileChooser *);
-  virtual void uninstallListeners(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-  virtual ::javax::swing::JPanel * createList(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::JPanel * createDetailsView(::javax::swing::JFileChooser *);
-public: // actually package-private
-  virtual ::javax::swing::JPanel * updateTable();
-private:
-  ::java::lang::String * formatSize(jlong);
-public:
-  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener(::javax::swing::JFileChooser *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JFileChooser *);
-public: // actually protected
-  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel * createDirectoryComboBoxModel(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxRenderer * createDirectoryComboBoxRenderer(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * createFilterComboBoxModel();
-  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxRenderer * createFilterComboBoxRenderer();
-  virtual void addControlButtons();
-  virtual void removeControlButtons();
-public:
-  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getFileName();
-  virtual void setFileName(::java::lang::String *);
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually protected
-  virtual ::javax::swing::JButton * getApproveButton(::javax::swing::JFileChooser *);
-public: // actually package-private
-  static void access$0(::javax::swing::plaf::metal::MetalFileChooserUI *, ::java::lang::String *);
-  static ::java::lang::String * access$1(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::java::lang::String * access$2(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::java::lang::String * access$3(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::java::lang::String * access$4(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::java::lang::String * access$5(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static void access$6(::javax::swing::plaf::metal::MetalFileChooserUI *, jboolean);
-  static void access$7(::javax::swing::plaf::metal::MetalFileChooserUI *, ::java::io::File *);
-  static ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * access$8(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::javax::swing::JButton * access$9(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::javax::swing::JPanel * access$10(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::javax::swing::JPanel * access$11(::javax::swing::plaf::metal::MetalFileChooserUI *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicFileChooserUI)))) directoryLabel;
-  ::javax::swing::JComboBox * directoryComboBox;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel * directoryModel;
-private:
-  ::java::lang::String * fileLabel;
-  ::javax::swing::JTextField * fileTextField;
-  ::java::lang::String * filterLabel;
-  ::javax::swing::JPanel * topPanel;
-  ::javax::swing::JPanel * controls;
-  ::javax::swing::JPanel * bottomPanel;
-  ::javax::swing::JPanel * buttonPanel;
-  ::javax::swing::JButton * approveButton;
-public: // actually package-private
-  ::javax::swing::JList * fileList;
-  ::javax::swing::JTable * fileTable;
-  ::javax::swing::JPanel * fileListPanel;
-  ::javax::swing::JPanel * fileTablePanel;
-private:
-  ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * filterModel;
-  ::javax::swing::ActionMap * actionMap;
-public: // actually package-private
-  jboolean listView;
-  jboolean startEditing;
-  ::javax::swing::JScrollPane * scrollPane;
-  ::java::lang::String * save;
-  ::java::lang::String * look;
-  ::javax::swing::JLabel * dirLabel;
-  ::javax::swing::event::ListSelectionListener * listSelList;
-  ::java::awt::event::MouseListener * doubleClickList;
-  ::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener * singleClickList;
-  ::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener * tableClickList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h
deleted file mode 100644
index 00054bddf86..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$1__
-#define __javax_swing_plaf_metal_MetalIconFactory$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalIconFactory$1();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h
deleted file mode 100644
index e969158f09c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$2__
-#define __javax_swing_plaf_metal_MetalIconFactory$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalIconFactory$2();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$2__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h
deleted file mode 100644
index ca03fe0c64a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$3__
-#define __javax_swing_plaf_metal_MetalIconFactory$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalIconFactory$3();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$3__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h
deleted file mode 100644
index 0625a9b249e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$CheckBoxMenuItemIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$CheckBoxMenuItemIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$CheckBoxMenuItemIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h
deleted file mode 100644
index 67b065fb412..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserDetailViewIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserDetailViewIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileChooserDetailViewIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h
deleted file mode 100644
index 5395249ab7b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserHomeFolderIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserHomeFolderIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileChooserHomeFolderIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h
deleted file mode 100644
index d1e479a83fc..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserListViewIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserListViewIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileChooserListViewIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h
deleted file mode 100644
index f34373e9565..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserNewFolderIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserNewFolderIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileChooserNewFolderIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h
deleted file mode 100644
index ad83e262363..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserUpFolderIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserUpFolderIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FileChooserNewFolderIcon
-{
-
-public:
-  MetalIconFactory$FileChooserUpFolderIcon();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h
deleted file mode 100644
index 90f451b9127..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileIcon16;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileIcon16 : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileIcon16();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual jint getAdditionalHeight();
-  virtual jint getShift();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h
deleted file mode 100644
index 80ed1ebdd4d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
-#define __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FolderIcon16;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FolderIcon16 : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FolderIcon16();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual jint getAdditionalHeight();
-  virtual jint getShift();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h
deleted file mode 100644
index cf726d87d54..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$HorizontalSliderThumbIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$HorizontalSliderThumbIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$HorizontalSliderThumbIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gradientMask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h
deleted file mode 100644
index 07a8d256acd..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameAltMaximizeIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameAltMaximizeIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameAltMaximizeIcon(jint);
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h
deleted file mode 100644
index 30289db5cfc..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameCloseIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameCloseIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameCloseIcon(jint);
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h
deleted file mode 100644
index 0c111ca032c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameDefaultMenuIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameDefaultMenuIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameDefaultMenuIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h
deleted file mode 100644
index 95014b00c7b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameMaximizeIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameMaximizeIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameMaximizeIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h
deleted file mode 100644
index 122d0282877..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameMinimizeIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameMinimizeIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameMinimizeIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h
deleted file mode 100644
index 11ee59a1575..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$PaletteCloseIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$PaletteCloseIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$PaletteCloseIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h
deleted file mode 100644
index 8d7eb638a28..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$RadioButtonIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$RadioButtonIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalIconFactory$RadioButtonIcon();
-public:
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-private:
-  static JArray< JArray< jint > * > * gradientMask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h
deleted file mode 100644
index 4d0e722ad00..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$RadioButtonMenuItemIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$RadioButtonMenuItemIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$RadioButtonMenuItemIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h
deleted file mode 100644
index f469798827d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeComputerIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeComputerIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$TreeComputerIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h
deleted file mode 100644
index c0e9716dcc8..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeControlIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeControlIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$TreeControlIcon(jboolean);
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual void paintMe(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isLight;
-private:
-  jboolean collapsed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h
deleted file mode 100644
index ad69d2d496b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeFloppyDriveIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeFloppyDriveIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$TreeFloppyDriveIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h
deleted file mode 100644
index 4993efdb24d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeFolderIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeFolderIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FolderIcon16
-{
-
-public:
-  MetalIconFactory$TreeFolderIcon();
-  virtual jint getAdditionalHeight();
-  virtual jint getShift();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h
deleted file mode 100644
index 1eb1d51434b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeHardDriveIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeHardDriveIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$TreeHardDriveIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h
deleted file mode 100644
index df2b8e8dab5..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeLeafIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeLeafIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FileIcon16
-{
-
-public:
-  MetalIconFactory$TreeLeafIcon();
-  virtual jint getAdditionalHeight();
-  virtual jint getShift();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h
deleted file mode 100644
index 7618da789f3..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$VerticalSliderThumbIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$VerticalSliderThumbIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$VerticalSliderThumbIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gradientMask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory.h b/libjava/javax/swing/plaf/metal/MetalIconFactory.h
deleted file mode 100644
index f1cb1d77e23..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory__
-#define __javax_swing_plaf_metal_MetalIconFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory;
-            class MetalIconFactory$RadioButtonIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory();
-  static ::javax::swing::Icon * getCheckBoxIcon();
-  static ::javax::swing::Icon * getCheckBoxMenuItemIcon();
-  static ::javax::swing::Icon * getFileChooserDetailViewIcon();
-  static ::javax::swing::Icon * getFileChooserHomeFolderIcon();
-  static ::javax::swing::Icon * getFileChooserListViewIcon();
-  static ::javax::swing::Icon * getFileChooserNewFolderIcon();
-  static ::javax::swing::Icon * getFileChooserUpFolderIcon();
-  static ::javax::swing::Icon * getRadioButtonIcon();
-  static ::javax::swing::Icon * getRadioButtonMenuItemIcon();
-  static ::javax::swing::Icon * getHorizontalSliderThumbIcon();
-  static ::javax::swing::Icon * getInternalFrameCloseIcon(jint);
-  static ::javax::swing::Icon * getInternalFrameDefaultMenuIcon();
-  static ::javax::swing::Icon * getInternalFrameMaximizeIcon(jint);
-  static ::javax::swing::Icon * getInternalFrameMinimizeIcon(jint);
-  static ::javax::swing::Icon * getInternalFrameAltMaximizeIcon(jint);
-  static ::javax::swing::Icon * getVerticalSliderThumbIcon();
-  static ::javax::swing::Icon * getTreeFolderIcon();
-  static ::javax::swing::Icon * getTreeLeafIcon();
-  static ::javax::swing::Icon * getTreeControlIcon(jboolean);
-  static ::javax::swing::Icon * getTreeComputerIcon();
-  static ::javax::swing::Icon * getTreeFloppyDriveIcon();
-  static ::javax::swing::Icon * getTreeHardDriveIcon();
-  static ::javax::swing::Icon * getMenuArrowIcon();
-  static ::javax::swing::Icon * getMenuItemArrowIcon();
-  static ::javax::swing::Icon * getMenuItemCheckIcon();
-  static const jboolean DARK = 0;
-  static const jboolean LIGHT = 1;
-private:
-  static ::javax::swing::Icon * menuArrow;
-  static ::javax::swing::Icon * menuItemArrow;
-  static ::javax::swing::Icon * checkBoxIcon;
-  static ::javax::swing::Icon * checkBoxMenuItemIcon;
-  static ::javax::swing::Icon * fileChooserDetailViewIcon;
-  static ::javax::swing::Icon * fileChooserHomeFolderIcon;
-  static ::javax::swing::Icon * fileChooserListViewIcon;
-  static ::javax::swing::Icon * fileChooserNewFolderIcon;
-  static ::javax::swing::Icon * fileChooserUpFolderIcon;
-  static ::javax::swing::plaf::metal::MetalIconFactory$RadioButtonIcon * radioButtonIcon;
-  static ::javax::swing::Icon * radioButtonMenuItemIcon;
-  static ::javax::swing::Icon * internalFrameDefaultMenuIcon;
-  static ::javax::swing::Icon * treeComputerIcon;
-  static ::javax::swing::Icon * treeFloppyDriveIcon;
-  static ::javax::swing::Icon * treeHardDriveIcon;
-  static ::javax::swing::Icon * horizontalSliderThumbIcon;
-  static ::javax::swing::Icon * verticalSliderThumbIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h
deleted file mode 100644
index ba566882302..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
-#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalInternalFrameTitlePane;
-            class MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler : public ::javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler
-{
-
-public:
-  MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h
deleted file mode 100644
index da7e76cb710..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
-#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalInternalFrameTitlePane;
-            class MetalInternalFrameTitlePane$MetalTitlePaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameTitlePane$MetalTitlePaneLayout : public ::java::lang::Object
-{
-
-public:
-  MetalInternalFrameTitlePane$MetalTitlePaneLayout(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h
deleted file mode 100644
index f3c0e7faba8..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
-#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicInternalFrameTitlePane.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JButton;
-        class JInternalFrame;
-        class JLabel;
-        class JMenu;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalInternalFrameTitlePane;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameTitlePane : public ::javax::swing::plaf::basic::BasicInternalFrameTitlePane
-{
-
-public:
-  MetalInternalFrameTitlePane(::javax::swing::JInternalFrame *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void createButtons();
-  virtual void addSystemMenuItems(::javax::swing::JMenu *);
-  virtual void showSystemMenu();
-  virtual void addSubComponents();
-  virtual ::java::awt::LayoutManager * createLayout();
-public:
-  virtual void paintPalette(::java::awt::Graphics *);
-  virtual void paintComponent(::java::awt::Graphics *);
-  virtual void setPalette(jboolean);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-public: // actually package-private
-  static ::javax::swing::JInternalFrame * access$0(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::JButton * access$1(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::Icon * access$2(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::JButton * access$3(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::Icon * access$4(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::JButton * access$5(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::Icon * access$6(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameTitlePane)))) isPalette;
-  ::javax::swing::Icon * paletteCloseIcon;
-  jint paletteTitleHeight;
-public: // actually package-private
-  ::javax::swing::JLabel * title;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h
deleted file mode 100644
index c707070acc3..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameUI$1__
-#define __javax_swing_plaf_metal_MetalInternalFrameUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalInternalFrameUI;
-            class MetalInternalFrameUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalInternalFrameUI$1(::javax::swing::plaf::metal::MetalInternalFrameUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameUI$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h
deleted file mode 100644
index db9fe9d86c9..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameUI__
-#define __javax_swing_plaf_metal_MetalInternalFrameUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicInternalFrameUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JInternalFrame;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalInternalFrameUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameUI : public ::javax::swing::plaf::basic::BasicInternalFrameUI
-{
-
-public:
-  MetalInternalFrameUI(::javax::swing::JInternalFrame *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::javax::swing::JComponent * createNorthPane(::javax::swing::JInternalFrame *);
-public:
-  virtual void setPalette(jboolean);
-public: // actually protected
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual void installKeyboardActions();
-  static ::java::lang::String * IS_PALETTE;
-private:
-  ::java::beans::PropertyChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameUI)))) paletteListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalLabelUI.h b/libjava/javax/swing/plaf/metal/MetalLabelUI.h
deleted file mode 100644
index f91d0993d3a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalLabelUI.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalLabelUI__
-#define __javax_swing_plaf_metal_MetalLabelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicLabelUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JLabel;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalLabelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalLabelUI : public ::javax::swing::plaf::basic::BasicLabelUI
-{
-
-public:
-  MetalLabelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintDisabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
-  static ::javax::swing::plaf::metal::MetalLabelUI * metalLabelUI;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalLabelUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h
deleted file mode 100644
index cdcfae136e9..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalLookAndFeel$1__
-#define __javax_swing_plaf_metal_MetalLookAndFeel$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalLookAndFeel;
-            class MetalLookAndFeel$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalLookAndFeel$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalLookAndFeel$1(::javax::swing::plaf::metal::MetalLookAndFeel *);
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalLookAndFeel$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
deleted file mode 100644
index 10a386dd093..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalLookAndFeel__
-#define __javax_swing_plaf_metal_MetalLookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-          class ColorUIResource;
-          class FontUIResource;
-        namespace metal
-        {
-            class MetalLookAndFeel;
-            class MetalTheme;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalLookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
-{
-
-public:
-  MetalLookAndFeel();
-public: // actually protected
-  virtual void createDefaultTheme();
-public:
-  virtual jboolean isNativeLookAndFeel();
-  virtual jboolean isSupportedLookAndFeel();
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getID();
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-  static ::javax::swing::plaf::ColorUIResource * getAcceleratorForeground();
-  static ::javax::swing::plaf::ColorUIResource * getAcceleratorSelectedForeground();
-  static ::javax::swing::plaf::ColorUIResource * getBlack();
-  static ::javax::swing::plaf::ColorUIResource * getControl();
-  static ::javax::swing::plaf::ColorUIResource * getControlDarkShadow();
-  static ::javax::swing::plaf::ColorUIResource * getControlDisabled();
-  static ::javax::swing::plaf::ColorUIResource * getControlHighlight();
-  static ::javax::swing::plaf::ColorUIResource * getControlInfo();
-  static ::javax::swing::plaf::ColorUIResource * getControlShadow();
-  static ::javax::swing::plaf::ColorUIResource * getControlTextColor();
-  static ::javax::swing::plaf::FontUIResource * getControlTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getDesktopColor();
-  static ::javax::swing::plaf::ColorUIResource * getFocusColor();
-  static ::javax::swing::plaf::ColorUIResource * getHighlightedTextColor();
-  static ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
-  static ::javax::swing::plaf::ColorUIResource * getInactiveSystemTextColor();
-  static ::javax::swing::plaf::ColorUIResource * getMenuBackground();
-  static ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
-  static ::javax::swing::plaf::ColorUIResource * getMenuForeground();
-  static ::javax::swing::plaf::ColorUIResource * getMenuSelectedBackground();
-  static ::javax::swing::plaf::ColorUIResource * getMenuSelectedForeground();
-  static ::javax::swing::plaf::FontUIResource * getMenuTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControl();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlDarkShadow();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlHighlight();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlInfo();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlShadow();
-  static ::javax::swing::plaf::ColorUIResource * getSeparatorBackground();
-  static ::javax::swing::plaf::ColorUIResource * getSeparatorForeground();
-  static ::javax::swing::plaf::FontUIResource * getSubTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getSystemTextColor();
-  static ::javax::swing::plaf::FontUIResource * getSystemTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getTextHighlightColor();
-  static ::javax::swing::plaf::ColorUIResource * getUserTextColor();
-  static ::javax::swing::plaf::FontUIResource * getUserTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getWhite();
-  static ::javax::swing::plaf::ColorUIResource * getWindowBackground();
-  static ::javax::swing::plaf::ColorUIResource * getWindowTitleBackground();
-  static ::javax::swing::plaf::FontUIResource * getWindowTitleFont();
-  static ::javax::swing::plaf::ColorUIResource * getWindowTitleForeground();
-  static ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveBackground();
-  static ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveForeground();
-  static void setCurrentTheme(::javax::swing::plaf::metal::MetalTheme *);
-public: // actually protected
-  virtual void initClassDefaults(::javax::swing::UIDefaults *);
-  virtual void initComponentDefaults(::javax::swing::UIDefaults *);
-  virtual void initSystemColorDefaults(::javax::swing::UIDefaults *);
-public:
-  static ::javax::swing::plaf::metal::MetalTheme * getCurrentTheme();
-  virtual jboolean getSupportsWindowDecorations();
-private:
-  static const jlong serialVersionUID = 6680646159193457980LL;
-  static ::javax::swing::plaf::metal::MetalTheme * theme;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalLookAndFeel__
diff --git a/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h b/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h
deleted file mode 100644
index 598291e4005..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalMenuBarUI__
-#define __javax_swing_plaf_metal_MetalMenuBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicMenuBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalMenuBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalMenuBarUI : public ::javax::swing::plaf::basic::BasicMenuBarUI
-{
-
-public:
-  MetalMenuBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalMenuBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h b/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h
deleted file mode 100644
index ca38d005b4d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
-#define __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalSeparatorUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalPopupMenuSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalPopupMenuSeparatorUI : public ::javax::swing::plaf::metal::MetalSeparatorUI
-{
-
-public:
-  MetalPopupMenuSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-private:
-  static ::javax::swing::plaf::metal::MetalPopupMenuSeparatorUI * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h b/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h
deleted file mode 100644
index ca9500ac5b2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalProgressBarUI__
-#define __javax_swing_plaf_metal_MetalProgressBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicProgressBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalProgressBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalProgressBarUI : public ::javax::swing::plaf::basic::BasicProgressBarUI
-{
-
-public:
-  MetalProgressBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void paintDeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paintIndeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalProgressBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h b/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h
deleted file mode 100644
index 477bca7cacc..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRadioButtonUI__
-#define __javax_swing_plaf_metal_MetalRadioButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicRadioButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalRadioButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRadioButtonUI : public ::javax::swing::plaf::basic::BasicRadioButtonUI
-{
-
-public:
-  MetalRadioButtonUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-public: // actually protected
-  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
-  virtual ::java::awt::Color * getSelectColor();
-  virtual ::java::awt::Color * getDisabledTextColor();
-  virtual ::java::awt::Color * getFocusColor();
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicRadioButtonUI)))) focusColor;
-  ::java::awt::Color * selectColor;
-  ::java::awt::Color * disabledTextColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRadioButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h
deleted file mode 100644
index aa5a0eb84d9..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalFrameBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalFrameBorder : public ::javax::swing::border::AbstractBorder
-{
-
-  MetalRootPaneUI$MetalFrameBorder();
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually package-private
-  MetalRootPaneUI$MetalFrameBorder(::javax::swing::plaf::metal::MetalRootPaneUI$MetalFrameBorder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h
deleted file mode 100644
index 8cf2767d29d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalRootLayout;
-            class MetalRootPaneUI$MetalTitlePane;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalRootLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalRootPaneUI$MetalRootLayout(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-public:
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-private:
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glassPaneBounds;
-  ::java::awt::Rectangle * layeredPaneBounds;
-  ::java::awt::Rectangle * contentPaneBounds;
-  ::java::awt::Rectangle * menuBarBounds;
-  ::java::awt::Rectangle * titlePaneBounds;
-  ::java::awt::Dimension * prefSize;
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * titlePane;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h
deleted file mode 100644
index 5837b81a47a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$CloseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$CloseAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  MetalRootPaneUI$MetalTitlePane$CloseAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h
deleted file mode 100644
index ea82f56189e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$IconifyAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$IconifyAction : public ::javax::swing::AbstractAction
-{
-
-  MetalRootPaneUI$MetalTitlePane$IconifyAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  MetalRootPaneUI$MetalTitlePane$IconifyAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$IconifyAction *);
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h
deleted file mode 100644
index bad5edc2aca..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$MaximizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MaximizeAction : public ::javax::swing::AbstractAction
-{
-
-  MetalRootPaneUI$MetalTitlePane$MaximizeAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  MetalRootPaneUI$MetalTitlePane$MaximizeAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MaximizeAction *);
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h
deleted file mode 100644
index 5bc79486c69..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout : public ::java::lang::Object
-{
-
-public:
-  MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h
deleted file mode 100644
index a1ee9cd5ca2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
-
-#pragma interface
-
-#include <javax/swing/event/MouseInputAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$MouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MouseHandler : public ::javax::swing::event::MouseInputAdapter
-{
-
-  MetalRootPaneUI$MetalTitlePane$MouseHandler(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  MetalRootPaneUI$MetalTitlePane$MouseHandler(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MouseHandler *);
-  ::java::awt::Point * __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) lastDragLocation;
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h
deleted file mode 100644
index 1505f5c47c6..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$PaneButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$PaneButton : public ::javax::swing::JButton
-{
-
-public:
-  MetalRootPaneUI$MetalTitlePane$PaneButton(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::Action *);
-  virtual jboolean isFocusable();
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h
deleted file mode 100644
index d9adc9b8a64..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class LayoutManager;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JButton;
-        class JLabel;
-        class JMenu;
-        class JMenuBar;
-        class JRootPane;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane : public ::javax::swing::JComponent
-{
-
-public: // actually package-private
-  MetalRootPaneUI$MetalTitlePane(::javax::swing::JRootPane *);
-public: // actually protected
-  virtual ::java::awt::LayoutManager * createLayout();
-  virtual void installTitlePane();
-private:
-  void enableActions();
-  void addSubComponents();
-  void installListeners();
-  void createActions();
-  void assembleSystemMenu();
-public: // actually protected
-  virtual ::javax::swing::JMenuBar * createSystemMenuBar();
-  virtual ::javax::swing::JMenu * createSystemMenu();
-private:
-  void addSystemMenuItems(::javax::swing::JMenu *);
-public: // actually protected
-  virtual void createButtons();
-  virtual void setButtonIcons();
-public:
-  virtual void paintComponent(::java::awt::Graphics *);
-public: // actually protected
-  virtual void paintTitleBackground(::java::awt::Graphics *);
-private:
-  void installDefaults();
-public: // actually package-private
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) rootPane;
-  ::javax::swing::JButton * closeButton;
-  ::javax::swing::JButton * iconButton;
-  ::javax::swing::JButton * maxButton;
-  ::javax::swing::Icon * minIcon;
-  ::javax::swing::Icon * maxIcon;
-private:
-  ::javax::swing::Icon * iconIcon;
-public: // actually package-private
-  ::javax::swing::Icon * closeIcon;
-private:
-  ::java::awt::Color * notSelectedTitleColor;
-  ::java::awt::Color * selectedTitleColor;
-public: // actually package-private
-  ::javax::swing::JLabel * title;
-private:
-  ::javax::swing::Action * closeAction;
-  ::javax::swing::Action * iconifyAction;
-  ::javax::swing::Action * maximizeAction;
-  ::javax::swing::JMenuBar * menuBar;
-public: // actually protected
-  ::javax::swing::JMenu * windowMenu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h
deleted file mode 100644
index dad96a54484..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI__
-#define __javax_swing_plaf_metal_MetalRootPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicRootPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JRootPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalRootPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI : public ::javax::swing::plaf::basic::BasicRootPaneUI
-{
-
-public:
-  MetalRootPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-private:
-  void installWindowDecorations(::javax::swing::JRootPane *);
-  void uninstallWindowDecorations(::javax::swing::JRootPane *);
-  static ::javax::swing::plaf::metal::MetalRootPaneUI * instance;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h b/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h
deleted file mode 100644
index 911ed4ddeb1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
-#define __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalScrollBarUI;
-            class MetalScrollBarUI$MetalScrollBarPropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalScrollBarUI$MetalScrollBarPropertyChangeHandler : public ::javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler
-{
-
-public:
-  MetalScrollBarUI$MetalScrollBarPropertyChangeHandler(::javax::swing::plaf::metal::MetalScrollBarUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h b/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h
deleted file mode 100644
index f76d33bddfb..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalScrollBarUI__
-#define __javax_swing_plaf_metal_MetalScrollBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicScrollBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalScrollBarUI;
-            class MetalScrollButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalScrollBarUI : public ::javax::swing::plaf::basic::BasicScrollBarUI
-{
-
-public:
-  MetalScrollBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::javax::swing::JButton * createDecreaseButton(jint);
-  virtual ::javax::swing::JButton * createIncreaseButton(jint);
-  virtual void paintTrack(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-private:
-  void paintTrackHorizontal(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint, jint);
-  void paintTrackVertical(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint, jint);
-public: // actually protected
-  virtual void paintThumb(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-private:
-  void paintThumbHorizontal(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-  void paintThumbVertical(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getMinimumThumbSize();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  static ::java::lang::String * FREE_STANDING_PROP;
-private:
-  static ::java::awt::Dimension * MIN_THUMB_SIZE;
-  static ::java::awt::Dimension * MIN_THUMB_SIZE_FREE_STANDING;
-public: // actually protected
-  ::javax::swing::plaf::metal::MetalScrollButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicScrollBarUI)))) increaseButton;
-  ::javax::swing::plaf::metal::MetalScrollButton * decreaseButton;
-  jint scrollBarWidth;
-  jboolean isFreeStanding;
-public: // actually package-private
-  ::java::awt::Color * scrollBarShadowColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalScrollBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollButton.h b/libjava/javax/swing/plaf/metal/MetalScrollButton.h
deleted file mode 100644
index 3a3d86125f2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalScrollButton.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalScrollButton__
-#define __javax_swing_plaf_metal_MetalScrollButton__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicArrowButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalScrollButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalScrollButton : public ::javax::swing::plaf::basic::BasicArrowButton
-{
-
-public:
-  MetalScrollButton(jint, jint, jboolean);
-  virtual jint getButtonWidth();
-  virtual void setFreeStanding(jboolean);
-  virtual void paint(::java::awt::Graphics *);
-private:
-  void paintArrow(::java::awt::Graphics *, jint, jint);
-  void paintNorthBorderFreeStanding(::java::awt::Graphics *, jint, jint);
-  void paintSouthBorderFreeStanding(::java::awt::Graphics *, jint, jint);
-  void paintEastBorderFreeStanding(::java::awt::Graphics *, jint, jint);
-  void paintWestBorderFreeStanding(::java::awt::Graphics *, jint, jint);
-  void paintNorthBorder(::java::awt::Graphics *, jint, jint);
-  void paintSouthBorder(::java::awt::Graphics *, jint, jint);
-  void paintEastBorder(::java::awt::Graphics *, jint, jint);
-  void paintWestBorder(::java::awt::Graphics *, jint, jint);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-private:
-  static ::java::awt::Dimension * maximumSize;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicArrowButton)))) buttonWidth;
-  jboolean freeStanding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalScrollButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h b/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h
deleted file mode 100644
index f751c355ee2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalScrollPaneUI__
-#define __javax_swing_plaf_metal_MetalScrollPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicScrollPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JScrollPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalScrollPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalScrollPaneUI : public ::javax::swing::plaf::basic::BasicScrollPaneUI
-{
-
-public:
-  MetalScrollPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void installListeners(::javax::swing::JScrollPane *);
-  virtual void uninstallListeners(::javax::swing::JScrollPane *);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createScrollBarSwapListener();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h b/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h
deleted file mode 100644
index afa4a33c713..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSeparatorUI__
-#define __javax_swing_plaf_metal_MetalSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
-{
-
-public:
-  MetalSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  static ::javax::swing::plaf::metal::MetalSeparatorUI * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSeparatorUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h b/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h
deleted file mode 100644
index a3b9554cb12..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
-#define __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalSliderUI;
-            class MetalSliderUI$MetalPropertyListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSliderUI$MetalPropertyListener : public ::javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler
-{
-
-public: // actually protected
-  MetalSliderUI$MetalPropertyListener(::javax::swing::plaf::metal::MetalSliderUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalSliderUI.h b/libjava/javax/swing/plaf/metal/MetalSliderUI.h
deleted file mode 100644
index 555e0b37dd5..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSliderUI.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSliderUI__
-#define __javax_swing_plaf_metal_MetalSliderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSliderUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JSlider;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalSliderUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSliderUI : public ::javax::swing::plaf::basic::BasicSliderUI
-{
-
-public:
-  MetalSliderUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JSlider *);
-public:
-  virtual void paintThumb(::java::awt::Graphics *);
-  virtual void paintTrack(::java::awt::Graphics *);
-  virtual void paintFocus(::java::awt::Graphics *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getThumbSize();
-public:
-  virtual jint getTickLength();
-public: // actually protected
-  virtual jint getTrackWidth();
-  virtual jint getTrackLength();
-  virtual jint getThumbOverhang();
-  virtual void scrollDueToClickInTrack(jint);
-  virtual void paintMinorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMajorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMinorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMajorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  static ::java::awt::Color * thumbColor;
-  static ::java::awt::Color * highlightColor;
-  static ::java::awt::Color * darkShadowColor;
-  static jint trackWidth;
-  static jint tickLength;
-  static ::javax::swing::Icon * horizThumbIcon;
-  static ::javax::swing::Icon * vertThumbIcon;
-  const jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSliderUI)))) TICK_BUFFER;
-  ::java::lang::String * SLIDER_FILL;
-  jboolean filledSlider;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSliderUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h
deleted file mode 100644
index ee348d7779d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
-#define __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalSplitPaneDivider;
-            class MetalSplitPaneDivider$MetalOneTouchButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSplitPaneDivider$MetalOneTouchButton : public ::javax::swing::JButton
-{
-
-public: // actually package-private
-  MetalSplitPaneDivider$MetalOneTouchButton(::javax::swing::plaf::metal::MetalSplitPaneDivider *, jint);
-public:
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual jboolean isFocusTraversable();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually package-private
-  static const jint LEFT = 0;
-  static const jint RIGHT = 1;
-private:
-  JArray< ::java::awt::Color * > * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) colors;
-  jint direction;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h
deleted file mode 100644
index 7230f6051e7..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider__
-#define __javax_swing_plaf_metal_MetalSplitPaneDivider__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSplitPaneDivider.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JButton;
-        class JSplitPane;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalSplitPaneDivider;
-            class MetalSplitPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSplitPaneDivider : public ::javax::swing::plaf::basic::BasicSplitPaneDivider
-{
-
-public:
-  MetalSplitPaneDivider(::javax::swing::plaf::metal::MetalSplitPaneUI *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paint(::java::awt::Graphics *);
-public: // actually protected
-  virtual ::javax::swing::JButton * createLeftOneTouchButton();
-  virtual ::javax::swing::JButton * createRightOneTouchButton();
-public: // actually package-private
-  static JArray< JArray< jbyte > * > * BUTTON_SPRITE_L;
-  static JArray< JArray< jbyte > * > * BUTTON_SPRITE_R;
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneDivider)))) dark;
-  ::java::awt::Color * light;
-  ::javax::swing::JSplitPane * splitPane;
-  jint orientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h
deleted file mode 100644
index 2505e06c27c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSplitPaneUI__
-#define __javax_swing_plaf_metal_MetalSplitPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSplitPaneUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-        }
-        namespace metal
-        {
-            class MetalSplitPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSplitPaneUI : public ::javax::swing::plaf::basic::BasicSplitPaneUI
-{
-
-public:
-  MetalSplitPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * createDefaultDivider();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h
deleted file mode 100644
index 0aa2214c5a2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
-#define __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalTabbedPaneUI;
-            class MetalTabbedPaneUI$TabbedPaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTabbedPaneUI$TabbedPaneLayout : public ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout
-{
-
-public:
-  MetalTabbedPaneUI$TabbedPaneLayout(::javax::swing::plaf::metal::MetalTabbedPaneUI *);
-public: // actually protected
-  virtual void rotateTabRuns(jint, jint);
-  virtual void padSelectedTab(jint, jint);
-  virtual void normalizeTabRuns(jint, jint, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h
deleted file mode 100644
index 12fdef6c931..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTabbedPaneUI__
-#define __javax_swing_plaf_metal_MetalTabbedPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTabbedPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class LayoutManager;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalTabbedPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTabbedPaneUI : public ::javax::swing::plaf::basic::BasicTabbedPaneUI
-{
-
-public:
-  MetalTabbedPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual void paintTabBorder(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintTopTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintLeftTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintRightTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintBottomTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintTabBackground(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintFocusIndicator(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
-  virtual jboolean shouldPadTabRun(jint, jint);
-  virtual void installDefaults();
-  virtual ::java::awt::Color * getColorForGap(jint, jint, jint);
-  virtual jboolean shouldFillGap(jint, jint, jint, jint);
-  virtual void paintHighlightBelowTab();
-  virtual jboolean shouldRotateTabRuns(jint, jint);
-  virtual jint calculateMaxTabHeight(jint);
-  virtual jint getTabRunOverlay(jint);
-  virtual void paintContentBorderTopEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderBottomEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderLeftEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderRightEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-private:
-  jboolean isLastTabInRun(jint);
-  ::java::awt::Color * getUnselectedBackground(jint);
-public: // actually protected
-  virtual jint getTabLabelShiftX(jint, jint, jboolean);
-  virtual jint getTabLabelShiftY(jint, jint, jboolean);
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI)))) minTabWidth;
-  ::java::awt::Color * selectColor;
-  ::java::awt::Color * selectHighlight;
-  ::java::awt::Color * tabAreaBackground;
-private:
-  ::java::awt::Graphics * hg;
-  jboolean tabsOpaque;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h b/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h
deleted file mode 100644
index 610de0bfbde..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTextFieldUI__
-#define __javax_swing_plaf_metal_MetalTextFieldUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalTextFieldUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTextFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
-{
-
-public:
-  MetalTextFieldUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTextFieldUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTheme.h b/libjava/javax/swing/plaf/metal/MetalTheme.h
deleted file mode 100644
index e8e813a88d5..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTheme.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTheme__
-#define __javax_swing_plaf_metal_MetalTheme__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-          class ColorUIResource;
-          class FontUIResource;
-        namespace metal
-        {
-            class MetalTheme;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTheme : public ::java::lang::Object
-{
-
-public:
-  MetalTheme();
-  virtual ::java::lang::String * getName() = 0;
-  virtual void addCustomEntriesToTable(::javax::swing::UIDefaults *);
-  virtual ::javax::swing::plaf::ColorUIResource * getAcceleratorForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getAcceleratorSelectedForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getControl();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlDarkShadow();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlDisabled();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlHighlight();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlInfo();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlShadow();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getDesktopColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getFocusColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getHighlightedTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getInactiveSystemTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuSelectedBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuSelectedForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControl();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlDarkShadow();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlHighlight();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlInfo();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlShadow();
-  virtual ::javax::swing::plaf::ColorUIResource * getSeparatorBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getSeparatorForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getSystemTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getTextHighlightColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getUserTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveForeground();
-public: // actually protected
-  virtual ::javax::swing::plaf::ColorUIResource * getBlack();
-  virtual ::javax::swing::plaf::ColorUIResource * getWhite();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3() = 0;
-public:
-  virtual ::javax::swing::plaf::FontUIResource * getControlTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getMenuTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getSubTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getSystemTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getUserTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getWindowTitleFont() = 0;
-private:
-  ::javax::swing::plaf::ColorUIResource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) BLACK;
-  ::javax::swing::plaf::ColorUIResource * WHITE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTheme__
diff --git a/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h b/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h
deleted file mode 100644
index a53cb8b0118..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToggleButtonUI__
-#define __javax_swing_plaf_metal_MetalToggleButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToggleButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalToggleButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToggleButtonUI : public ::javax::swing::plaf::basic::BasicToggleButtonUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  MetalToggleButtonUI();
-public: // actually protected
-  virtual ::java::awt::Color * getFocusColor();
-  virtual ::java::awt::Color * getSelectColor();
-  virtual ::java::awt::Color * getDisabledTextColor();
-public:
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-public: // actually protected
-  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
-  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-public:
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToggleButtonUI)))) focusColor;
-  ::java::awt::Color * selectColor;
-  ::java::awt::Color * disabledTextColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToggleButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h
deleted file mode 100644
index b04a7bb6353..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
-#define __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalToolBarUI;
-            class MetalToolBarUI$MetalContainerListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolBarUI$MetalContainerListener : public ::javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener
-{
-
-public: // actually protected
-  MetalToolBarUI$MetalContainerListener(::javax::swing::plaf::metal::MetalToolBarUI *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h
deleted file mode 100644
index f509544b3aa..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
-#define __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToolBar;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalToolBarUI;
-            class MetalToolBarUI$MetalDockingListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolBarUI$MetalDockingListener : public ::javax::swing::plaf::basic::BasicToolBarUI$DockingListener
-{
-
-public:
-  MetalToolBarUI$MetalDockingListener(::javax::swing::plaf::metal::MetalToolBarUI *, ::javax::swing::JToolBar *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$DockingListener)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h
deleted file mode 100644
index 8b254a6c133..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
-#define __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalToolBarUI;
-            class MetalToolBarUI$MetalRolloverListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolBarUI$MetalRolloverListener : public ::javax::swing::plaf::basic::BasicToolBarUI$PropertyListener
-{
-
-public: // actually protected
-  MetalToolBarUI$MetalRolloverListener(::javax::swing::plaf::metal::MetalToolBarUI *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$PropertyListener)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI.h
deleted file mode 100644
index 95be69ffd07..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolBarUI.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolBarUI__
-#define __javax_swing_plaf_metal_MetalToolBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Point;
-      namespace event
-      {
-          class ContainerListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalToolBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolBarUI : public ::javax::swing::plaf::basic::BasicToolBarUI
-{
-
-public:
-  MetalToolBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createRolloverListener();
-  virtual ::java::awt::event::ContainerListener * createContainerListener();
-  virtual ::javax::swing::border::Border * createNonRolloverBorder();
-  virtual void setDragOffset(::java::awt::Point *);
-  virtual ::javax::swing::event::MouseInputListener * createDockingListener();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI)))) contListener;
-  ::java::beans::PropertyChangeListener * rolloverListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolTipUI.h b/libjava/javax/swing/plaf/metal/MetalToolTipUI.h
deleted file mode 100644
index f38637c6db2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolTipUI.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolTipUI__
-#define __javax_swing_plaf_metal_MetalToolTipUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolTipUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Font;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class KeyStroke;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalToolTipUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolTipUI : public ::javax::swing::plaf::basic::BasicToolTipUI
-{
-
-public:
-  MetalToolTipUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::lang::String * getAcceleratorString();
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jboolean isAcceleratorHidden();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  ::java::lang::String * fetchAcceleratorString(::javax::swing::JComponent *);
-  ::java::lang::String * acceleratorToString(::javax::swing::KeyStroke *);
-public:
-  static const jint padSpaceBetweenStrings = 12;
-private:
-  static ::javax::swing::plaf::metal::MetalToolTipUI * instance;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolTipUI)))) isAcceleratorHidden__;
-  ::java::lang::String * acceleratorString;
-  ::java::lang::String * acceleratorDelimiter;
-  ::java::awt::Font * acceleratorFont;
-  ::java::awt::Color * acceleratorForeground;
-  ::javax::swing::border::Border * activeBorder;
-  ::javax::swing::border::Border * inactiveBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolTipUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h b/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h
deleted file mode 100644
index e0ffe068fc3..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
-#define __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalTreeUI;
-            class MetalTreeUI$LineStyleListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTreeUI$LineStyleListener : public ::java::lang::Object
-{
-
-  MetalTreeUI$LineStyleListener(::javax::swing::plaf::metal::MetalTreeUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  MetalTreeUI$LineStyleListener(::javax::swing::plaf::metal::MetalTreeUI *, ::javax::swing::plaf::metal::MetalTreeUI$LineStyleListener *);
-  ::javax::swing::plaf::metal::MetalTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalTreeUI.h b/libjava/javax/swing/plaf/metal/MetalTreeUI.h
deleted file mode 100644
index 98cf994a24f..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTreeUI.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTreeUI__
-#define __javax_swing_plaf_metal_MetalTreeUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTreeUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalTreeUI;
-        }
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTreeUI : public ::javax::swing::plaf::basic::BasicTreeUI
-{
-
-public:
-  MetalTreeUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jint getHorizontalLegBuffer();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void decodeLineStyle(::java::lang::Object *);
-  virtual jboolean isLocationInExpandControl(jint, jint, jint, jint);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintHorizontalSeparators(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paintVerticalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::javax::swing::tree::TreePath *);
-  virtual void paintHorizontalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-private:
-  static ::java::lang::String * LINE_STYLE_PROPERTY;
-  static ::java::lang::String * LINE_STYLE_VALUE_NONE;
-  static ::java::lang::String * LINE_STYLE_VALUE_ANGLED;
-  static ::java::lang::String * LINE_STYLE_VALUE_HORIZONTAL;
-  static const jint LINE_STYLE_NONE = 0;
-  static const jint LINE_STYLE_ANGLED = 1;
-  static const jint LINE_STYLE_HORIZONTAL = 2;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTreeUI)))) lineStyle;
-  ::java::beans::PropertyChangeListener * lineStyleListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTreeUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalUtils.h b/libjava/javax/swing/plaf/metal/MetalUtils.h
deleted file mode 100644
index 3dd94a23fde..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalUtils.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalUtils__
-#define __javax_swing_plaf_metal_MetalUtils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Graphics2D;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalUtils;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalUtils : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalUtils();
-  static void fillMetalPattern(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
-  static void fillMetalPattern2D(::java::awt::Graphics2D *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
-  static void initializePattern(::java::awt::Color *, ::java::awt::Color *);
-  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::lang::String *);
-  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::lang::String *, JArray< JArray< jint > * > *);
-  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, jint, JArray< JArray< jint > * > *);
-  static void paintHorizontalGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
-  static void paintVerticalGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
-private:
-  static void paintHorizontalGradient2D(::java::awt::Graphics2D *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
-  static void paintVerticalGradient2D(::java::awt::Graphics2D *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
-public: // actually package-private
-  static ::java::awt::image::BufferedImage * pattern2D;
-  static ::java::awt::Color * lightColor;
-  static ::java::awt::Color * darkColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalUtils__
diff --git a/libjava/javax/swing/plaf/metal/OceanTheme.h b/libjava/javax/swing/plaf/metal/OceanTheme.h
deleted file mode 100644
index 2587609811f..00000000000
--- a/libjava/javax/swing/plaf/metal/OceanTheme.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_OceanTheme__
-#define __javax_swing_plaf_metal_OceanTheme__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/DefaultMetalTheme.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-          class ColorUIResource;
-        namespace metal
-        {
-            class OceanTheme;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::OceanTheme : public ::javax::swing::plaf::metal::DefaultMetalTheme
-{
-
-public:
-  OceanTheme();
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getDesktopColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
-public: // actually protected
-  virtual ::javax::swing::plaf::ColorUIResource * getBlack();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
-public:
-  virtual void addCustomEntriesToTable(::javax::swing::UIDefaults *);
-public: // actually package-private
-  static ::javax::swing::plaf::ColorUIResource * BLACK;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY1;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY2;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY3;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY1;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY2;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY3;
-  static ::javax::swing::plaf::ColorUIResource * INACTIVE_CONTROL_TEXT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_OceanTheme__
diff --git a/libjava/javax/swing/plaf/multi/MultiButtonUI.h b/libjava/javax/swing/plaf/multi/MultiButtonUI.h
deleted file mode 100644
index 3481b6eee4e..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiButtonUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiButtonUI__
-#define __javax_swing_plaf_multi_MultiButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ButtonUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiButtonUI : public ::javax::swing::plaf::ButtonUI
-{
-
-public:
-  MultiButtonUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ButtonUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiButtonUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h b/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h
deleted file mode 100644
index d890eeabef3..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiColorChooserUI__
-#define __javax_swing_plaf_multi_MultiColorChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ColorChooserUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiColorChooserUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiColorChooserUI : public ::javax::swing::plaf::ColorChooserUI
-{
-
-public:
-  MultiColorChooserUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ColorChooserUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiColorChooserUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h b/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h
deleted file mode 100644
index 9e92a3237d6..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiComboBoxUI__
-#define __javax_swing_plaf_multi_MultiComboBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComboBoxUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComboBox;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiComboBoxUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiComboBoxUI : public ::javax::swing::plaf::ComboBoxUI
-{
-
-public:
-  MultiComboBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean);
-  virtual jboolean isPopupVisible(::javax::swing::JComboBox *);
-  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ComboBoxUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiComboBoxUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h b/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h
deleted file mode 100644
index d7a5f47fe08..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiDesktopIconUI__
-#define __javax_swing_plaf_multi_MultiDesktopIconUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/DesktopIconUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiDesktopIconUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiDesktopIconUI : public ::javax::swing::plaf::DesktopIconUI
-{
-
-public:
-  MultiDesktopIconUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopIconUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h b/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h
deleted file mode 100644
index d6dcff2c2b8..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiDesktopPaneUI__
-#define __javax_swing_plaf_multi_MultiDesktopPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/DesktopPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiDesktopPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiDesktopPaneUI : public ::javax::swing::plaf::DesktopPaneUI
-{
-
-public:
-  MultiDesktopPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiDesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h b/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h
deleted file mode 100644
index e459d3280a7..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiFileChooserUI__
-#define __javax_swing_plaf_multi_MultiFileChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/FileChooserUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JFileChooser;
-      namespace filechooser
-      {
-          class FileFilter;
-          class FileView;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiFileChooserUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiFileChooserUI : public ::javax::swing::plaf::FileChooserUI
-{
-
-public:
-  MultiFileChooserUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *);
-  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
-  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::FileChooserUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiFileChooserUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h b/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h
deleted file mode 100644
index ab260b70989..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiInternalFrameUI__
-#define __javax_swing_plaf_multi_MultiInternalFrameUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/InternalFrameUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiInternalFrameUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiInternalFrameUI : public ::javax::swing::plaf::InternalFrameUI
-{
-
-public:
-  MultiInternalFrameUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::InternalFrameUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiLabelUI.h b/libjava/javax/swing/plaf/multi/MultiLabelUI.h
deleted file mode 100644
index 7f5049cecb1..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiLabelUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiLabelUI__
-#define __javax_swing_plaf_multi_MultiLabelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/LabelUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiLabelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiLabelUI : public ::javax::swing::plaf::LabelUI
-{
-
-public:
-  MultiLabelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiLabelUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiListUI.h b/libjava/javax/swing/plaf/multi/MultiListUI.h
deleted file mode 100644
index 3147894c629..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiListUI.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiListUI__
-#define __javax_swing_plaf_multi_MultiListUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ListUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JList;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiListUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiListUI : public ::javax::swing::plaf::ListUI
-{
-
-public:
-  MultiListUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *);
-  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint);
-  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ListUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiListUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h b/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h
deleted file mode 100644
index 83925d036ed..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiLookAndFeel__
-#define __javax_swing_plaf_multi_MultiLookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/LookAndFeel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class UIDefaults;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiLookAndFeel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiLookAndFeel : public ::javax::swing::LookAndFeel
-{
-
-public:
-  MultiLookAndFeel();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getID();
-  virtual ::java::lang::String * getDescription();
-  virtual jboolean isNativeLookAndFeel();
-  virtual jboolean isSupportedLookAndFeel();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-  static ::javax::swing::plaf::ComponentUI * createUIs(::javax::swing::plaf::ComponentUI *, ::java::util::Vector *, ::javax::swing::JComponent *);
-public: // actually protected
-  static JArray< ::javax::swing::plaf::ComponentUI * > * uisToArray(::java::util::Vector *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiLookAndFeel__
diff --git a/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h b/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h
deleted file mode 100644
index 9056557b4c7..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiMenuBarUI__
-#define __javax_swing_plaf_multi_MultiMenuBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/MenuBarUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiMenuBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiMenuBarUI : public ::javax::swing::plaf::MenuBarUI
-{
-
-public:
-  MultiMenuBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuBarUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiMenuBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h b/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h
deleted file mode 100644
index 7bbe2f23173..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiMenuItemUI__
-#define __javax_swing_plaf_multi_MultiMenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/MenuItemUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiMenuItemUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiMenuItemUI : public ::javax::swing::plaf::MenuItemUI
-{
-
-public:
-  MultiMenuItemUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuItemUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiMenuItemUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h b/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h
deleted file mode 100644
index ce895299c71..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiOptionPaneUI__
-#define __javax_swing_plaf_multi_MultiOptionPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/OptionPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JOptionPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiOptionPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiOptionPaneUI : public ::javax::swing::plaf::OptionPaneUI
-{
-
-public:
-  MultiOptionPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual void selectInitialValue(::javax::swing::JOptionPane *);
-  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::OptionPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiOptionPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiPanelUI.h b/libjava/javax/swing/plaf/multi/MultiPanelUI.h
deleted file mode 100644
index 83ac57c09d0..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiPanelUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiPanelUI__
-#define __javax_swing_plaf_multi_MultiPanelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/PanelUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiPanelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiPanelUI : public ::javax::swing::plaf::PanelUI
-{
-
-public:
-  MultiPanelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PanelUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiPanelUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h b/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h
deleted file mode 100644
index 717775652cd..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiPopupMenuUI__
-#define __javax_swing_plaf_multi_MultiPopupMenuUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/PopupMenuUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiPopupMenuUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiPopupMenuUI : public ::javax::swing::plaf::PopupMenuUI
-{
-
-public:
-  MultiPopupMenuUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PopupMenuUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiPopupMenuUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h b/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h
deleted file mode 100644
index 797f3cab584..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiProgressBarUI__
-#define __javax_swing_plaf_multi_MultiProgressBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ProgressBarUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiProgressBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiProgressBarUI : public ::javax::swing::plaf::ProgressBarUI
-{
-
-public:
-  MultiProgressBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ProgressBarUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiProgressBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h b/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h
deleted file mode 100644
index b45c22996f9..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiRootPaneUI__
-#define __javax_swing_plaf_multi_MultiRootPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/RootPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiRootPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiRootPaneUI : public ::javax::swing::plaf::RootPaneUI
-{
-
-public:
-  MultiRootPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::RootPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiRootPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h b/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h
deleted file mode 100644
index 0fd88116ad8..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiScrollBarUI__
-#define __javax_swing_plaf_multi_MultiScrollBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ScrollBarUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiScrollBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiScrollBarUI : public ::javax::swing::plaf::ScrollBarUI
-{
-
-public:
-  MultiScrollBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollBarUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiScrollBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h b/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h
deleted file mode 100644
index a05716a60a0..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiScrollPaneUI__
-#define __javax_swing_plaf_multi_MultiScrollPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ScrollPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiScrollPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiScrollPaneUI : public ::javax::swing::plaf::ScrollPaneUI
-{
-
-public:
-  MultiScrollPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h b/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h
deleted file mode 100644
index b62235a18cd..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiSeparatorUI__
-#define __javax_swing_plaf_multi_MultiSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SeparatorUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiSeparatorUI : public ::javax::swing::plaf::SeparatorUI
-{
-
-public:
-  MultiSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SeparatorUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiSeparatorUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSliderUI.h b/libjava/javax/swing/plaf/multi/MultiSliderUI.h
deleted file mode 100644
index b66d32ab54e..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiSliderUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiSliderUI__
-#define __javax_swing_plaf_multi_MultiSliderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SliderUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiSliderUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiSliderUI : public ::javax::swing::plaf::SliderUI
-{
-
-public:
-  MultiSliderUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SliderUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiSliderUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h b/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h
deleted file mode 100644
index 32a9d868252..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiSpinnerUI__
-#define __javax_swing_plaf_multi_MultiSpinnerUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SpinnerUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiSpinnerUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiSpinnerUI : public ::javax::swing::plaf::SpinnerUI
-{
-
-public:
-  MultiSpinnerUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SpinnerUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiSpinnerUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h b/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h
deleted file mode 100644
index 5ed5638fe88..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiSplitPaneUI__
-#define __javax_swing_plaf_multi_MultiSplitPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SplitPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JSplitPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiSplitPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiSplitPaneUI : public ::javax::swing::plaf::SplitPaneUI
-{
-
-public:
-  MultiSplitPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *);
-  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint);
-  virtual jint getDividerLocation(::javax::swing::JSplitPane *);
-  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *);
-  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *);
-  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SplitPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h b/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h
deleted file mode 100644
index 7740c3fd183..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTabbedPaneUI__
-#define __javax_swing_plaf_multi_MultiTabbedPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TabbedPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JTabbedPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTabbedPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTabbedPaneUI : public ::javax::swing::plaf::TabbedPaneUI
-{
-
-public:
-  MultiTabbedPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint);
-  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint);
-  virtual jint getTabRunCount(::javax::swing::JTabbedPane *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TabbedPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h b/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h
deleted file mode 100644
index 87cf03ef5a5..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTableHeaderUI__
-#define __javax_swing_plaf_multi_MultiTableHeaderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TableHeaderUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTableHeaderUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTableHeaderUI : public ::javax::swing::plaf::TableHeaderUI
-{
-
-public:
-  MultiTableHeaderUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableHeaderUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTableHeaderUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTableUI.h b/libjava/javax/swing/plaf/multi/MultiTableUI.h
deleted file mode 100644
index cb84f0f2c53..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTableUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTableUI__
-#define __javax_swing_plaf_multi_MultiTableUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TableUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTableUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTableUI : public ::javax::swing::plaf::TableUI
-{
-
-public:
-  MultiTableUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTableUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTextUI.h b/libjava/javax/swing/plaf/multi/MultiTextUI.h
deleted file mode 100644
index 6d0440e7a88..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTextUI.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTextUI__
-#define __javax_swing_plaf_multi_MultiTextUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TextUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTextUI;
-        }
-      }
-      namespace text
-      {
-          class EditorKit;
-          class JTextComponent;
-          class Position$Bias;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTextUI : public ::javax::swing::plaf::TextUI
-{
-
-public:
-  MultiTextUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint);
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint);
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *);
-  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
-  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TextUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTextUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiToolBarUI.h b/libjava/javax/swing/plaf/multi/MultiToolBarUI.h
deleted file mode 100644
index 91c89162895..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiToolBarUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiToolBarUI__
-#define __javax_swing_plaf_multi_MultiToolBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ToolBarUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiToolBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiToolBarUI : public ::javax::swing::plaf::ToolBarUI
-{
-
-public:
-  MultiToolBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolBarUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiToolBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiToolTipUI.h b/libjava/javax/swing/plaf/multi/MultiToolTipUI.h
deleted file mode 100644
index 07ed28e7372..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiToolTipUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiToolTipUI__
-#define __javax_swing_plaf_multi_MultiToolTipUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ToolTipUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiToolTipUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiToolTipUI : public ::javax::swing::plaf::ToolTipUI
-{
-
-public:
-  MultiToolTipUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolTipUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiToolTipUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTreeUI.h b/libjava/javax/swing/plaf/multi/MultiTreeUI.h
deleted file mode 100644
index 0477cc6267e..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTreeUI.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTreeUI__
-#define __javax_swing_plaf_multi_MultiTreeUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TreeUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JTree;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTreeUI;
-        }
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTreeUI : public ::javax::swing::plaf::TreeUI
-{
-
-public:
-  MultiTreeUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint);
-  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual jint getRowCount(::javax::swing::JTree *);
-  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint);
-  virtual jboolean isEditing(::javax::swing::JTree *);
-  virtual jboolean stopEditing(::javax::swing::JTree *);
-  virtual void cancelEditing(::javax::swing::JTree *);
-  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TreeUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTreeUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiViewportUI.h b/libjava/javax/swing/plaf/multi/MultiViewportUI.h
deleted file mode 100644
index 6ddbb0b9bd1..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiViewportUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiViewportUI__
-#define __javax_swing_plaf_multi_MultiViewportUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ViewportUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiViewportUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiViewportUI : public ::javax::swing::plaf::ViewportUI
-{
-
-public:
-  MultiViewportUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ViewportUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiViewportUI__
diff --git a/libjava/javax/swing/plaf/synth/ColorType.h b/libjava/javax/swing/plaf/synth/ColorType.h
deleted file mode 100644
index 99a238cf302..00000000000
--- a/libjava/javax/swing/plaf/synth/ColorType.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_ColorType__
-#define __javax_swing_plaf_synth_ColorType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace synth
-        {
-            class ColorType;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::ColorType : public ::java::lang::Object
-{
-
-public: // actually protected
-  ColorType(::java::lang::String *);
-public:
-  virtual jint getID();
-  virtual ::java::lang::String * toString();
-  static ::javax::swing::plaf::synth::ColorType * FOREGROUND;
-  static ::javax::swing::plaf::synth::ColorType * BACKGROUND;
-  static ::javax::swing::plaf::synth::ColorType * TEXT_FOREGROUND;
-  static ::javax::swing::plaf::synth::ColorType * TEXT_BACKGROUND;
-  static ::javax::swing::plaf::synth::ColorType * FOCUS;
-  static jint MAX_COUNT;
-private:
-  static jint count;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::lang::String * description;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_ColorType__
diff --git a/libjava/javax/swing/plaf/synth/Region.h b/libjava/javax/swing/plaf/synth/Region.h
deleted file mode 100644
index 1df2b4f9fc6..00000000000
--- a/libjava/javax/swing/plaf/synth/Region.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_Region__
-#define __javax_swing_plaf_synth_Region__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace synth
-        {
-            class Region;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::Region : public ::java::lang::Object
-{
-
-public: // actually protected
-  Region(::java::lang::String *, ::java::lang::String *, jboolean);
-public:
-  virtual jboolean isSubregion();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * toString();
-  static ::javax::swing::plaf::synth::Region * ARROW_BUTTON;
-  static ::javax::swing::plaf::synth::Region * BUTTON;
-  static ::javax::swing::plaf::synth::Region * CHECK_BOX;
-  static ::javax::swing::plaf::synth::Region * CHECK_BOX_MENU_ITEM;
-  static ::javax::swing::plaf::synth::Region * COLOR_CHOOSER;
-  static ::javax::swing::plaf::synth::Region * COMBO_BOX;
-  static ::javax::swing::plaf::synth::Region * DESKTOP_PANE;
-  static ::javax::swing::plaf::synth::Region * DESKTOP_ICON;
-  static ::javax::swing::plaf::synth::Region * EDITOR_PANE;
-  static ::javax::swing::plaf::synth::Region * FILE_CHOOSER;
-  static ::javax::swing::plaf::synth::Region * FORMATTED_TEXT_FIELD;
-  static ::javax::swing::plaf::synth::Region * INTERNAL_FRAME;
-  static ::javax::swing::plaf::synth::Region * INTERNAL_FRAME_TITLE_PANE;
-  static ::javax::swing::plaf::synth::Region * LABEL;
-  static ::javax::swing::plaf::synth::Region * LIST;
-  static ::javax::swing::plaf::synth::Region * MENU;
-  static ::javax::swing::plaf::synth::Region * MENU_BAR;
-  static ::javax::swing::plaf::synth::Region * MENU_ITEM;
-  static ::javax::swing::plaf::synth::Region * MENU_ITEM_ACCELERATOR;
-  static ::javax::swing::plaf::synth::Region * OPTION_PANE;
-  static ::javax::swing::plaf::synth::Region * PANEL;
-  static ::javax::swing::plaf::synth::Region * PASSWORD_FIELD;
-  static ::javax::swing::plaf::synth::Region * POPUP_MENU;
-  static ::javax::swing::plaf::synth::Region * POPUP_MENU_SEPARATOR;
-  static ::javax::swing::plaf::synth::Region * PROGRESS_BAR;
-  static ::javax::swing::plaf::synth::Region * RADIO_BUTTON;
-  static ::javax::swing::plaf::synth::Region * RADIO_BUTTON_MENU_ITEM;
-  static ::javax::swing::plaf::synth::Region * ROOT_PANE;
-  static ::javax::swing::plaf::synth::Region * SCROLL_BAR;
-  static ::javax::swing::plaf::synth::Region * SCROLL_BAR_TRACK;
-  static ::javax::swing::plaf::synth::Region * SCROLL_BAR_THUMB;
-  static ::javax::swing::plaf::synth::Region * SCROLL_PANE;
-  static ::javax::swing::plaf::synth::Region * SEPARATOR;
-  static ::javax::swing::plaf::synth::Region * SLIDER;
-  static ::javax::swing::plaf::synth::Region * SLIDER_TRACK;
-  static ::javax::swing::plaf::synth::Region * SLIDER_THUMB;
-  static ::javax::swing::plaf::synth::Region * SPINNER;
-  static ::javax::swing::plaf::synth::Region * SPLIT_PANE;
-  static ::javax::swing::plaf::synth::Region * SPLIT_PANE_DIVIDER;
-  static ::javax::swing::plaf::synth::Region * TABBED_PANE;
-  static ::javax::swing::plaf::synth::Region * TABBED_PANE_TAB;
-  static ::javax::swing::plaf::synth::Region * TABBED_PANE_TAB_AREA;
-  static ::javax::swing::plaf::synth::Region * TABBED_PANE_CONTENT;
-  static ::javax::swing::plaf::synth::Region * TABLE;
-  static ::javax::swing::plaf::synth::Region * TABLE_HEADER;
-  static ::javax::swing::plaf::synth::Region * TEXT_AREA;
-  static ::javax::swing::plaf::synth::Region * TEXT_FIELD;
-  static ::javax::swing::plaf::synth::Region * TEXT_PANE;
-  static ::javax::swing::plaf::synth::Region * TOGGLE_BUTTON;
-  static ::javax::swing::plaf::synth::Region * TOOL_BAR;
-  static ::javax::swing::plaf::synth::Region * TOOL_BAR_CONTENT;
-  static ::javax::swing::plaf::synth::Region * TOOL_BAR_DRAG_WINDOW;
-  static ::javax::swing::plaf::synth::Region * TOOL_TIP;
-  static ::javax::swing::plaf::synth::Region * TOOL_BAR_SEPARATOR;
-  static ::javax::swing::plaf::synth::Region * TREE;
-  static ::javax::swing::plaf::synth::Region * TREE_CELL;
-  static ::javax::swing::plaf::synth::Region * VIEWPORT;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ui;
-private:
-  ::java::lang::String * name;
-  jboolean subregion;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_Region__
diff --git a/libjava/javax/swing/plaf/synth/SynthConstants.h b/libjava/javax/swing/plaf/synth/SynthConstants.h
deleted file mode 100644
index a6ae6deb832..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthConstants.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthConstants__
-#define __javax_swing_plaf_synth_SynthConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace synth
-        {
-            class SynthConstants;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint ENABLED = 1;
-  static const jint DISABLED = 8;
-  static const jint MOUSE_OVER = 2;
-  static const jint PRESSED = 4;
-  static const jint FOCUSED = 256;
-  static const jint SELECTED = 512;
-  static const jint DEFAULT = 1024;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_plaf_synth_SynthConstants__
diff --git a/libjava/javax/swing/plaf/synth/SynthContext.h b/libjava/javax/swing/plaf/synth/SynthContext.h
deleted file mode 100644
index 7e2eadb6dc7..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthContext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthContext__
-#define __javax_swing_plaf_synth_SynthContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-        namespace synth
-        {
-            class Region;
-            class SynthContext;
-            class SynthStyle;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthContext : public ::java::lang::Object
-{
-
-public:
-  SynthContext(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *, ::javax::swing::plaf::synth::SynthStyle *, jint);
-  virtual ::javax::swing::JComponent * getComponent();
-  virtual ::javax::swing::plaf::synth::Region * getRegion();
-  virtual ::javax::swing::plaf::synth::SynthStyle * getStyle();
-  virtual jint getComponentState();
-private:
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
-  ::javax::swing::plaf::synth::Region * region;
-  ::javax::swing::plaf::synth::SynthStyle * style;
-  jint state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthContext__
diff --git a/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h b/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h
deleted file mode 100644
index 36c09c1a0d5..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthGraphicsUtils__
-#define __javax_swing_plaf_synth_SynthGraphicsUtils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace synth
-        {
-            class SynthContext;
-            class SynthGraphicsUtils;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthGraphicsUtils : public ::java::lang::Object
-{
-
-public:
-  SynthGraphicsUtils();
-  virtual void drawLine(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::lang::String * layoutText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
-  virtual jint computeStringWidth(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::awt::FontMetrics *, ::java::lang::String *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
-  virtual jint getMaximumCharHeight(::javax::swing::plaf::synth::SynthContext *);
-  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, ::java::awt::Rectangle *, jint);
-  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthGraphicsUtils__
diff --git a/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h b/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h
deleted file mode 100644
index d0b40a878b7..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthLookAndFeel__
-#define __javax_swing_plaf_synth_SynthLookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class UIDefaults;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace synth
-        {
-            class Region;
-            class SynthLookAndFeel;
-            class SynthStyle;
-            class SynthStyleFactory;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthLookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
-{
-
-public:
-  SynthLookAndFeel();
-  static void setStyleFactory(::javax::swing::plaf::synth::SynthStyleFactory *);
-  static ::javax::swing::plaf::synth::SynthStyleFactory * getStyleFactory();
-  static ::javax::swing::plaf::synth::SynthStyle * getStyle(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *);
-  static void updateStyles(::java::awt::Component *);
-  static ::javax::swing::plaf::synth::Region * getRegion(::javax::swing::JComponent *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void initialize();
-  virtual void uninitialize();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-  virtual jboolean shouldUpdateStyleOnAncestorChanged();
-  virtual void load(::java::io::InputStream *, ::java::lang::Class *);
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getID();
-  virtual ::java::lang::String * getName();
-  virtual jboolean isNativeLookAndFeel();
-  virtual jboolean isSupportedLookAndFeel();
-private:
-  static ::javax::swing::plaf::synth::SynthStyleFactory * styleFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthLookAndFeel__
diff --git a/libjava/javax/swing/plaf/synth/SynthPainter.h b/libjava/javax/swing/plaf/synth/SynthPainter.h
deleted file mode 100644
index 23172a0ad59..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthPainter.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthPainter__
-#define __javax_swing_plaf_synth_SynthPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace synth
-        {
-            class SynthContext;
-            class SynthPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthPainter : public ::java::lang::Object
-{
-
-public:
-  SynthPainter();
-  virtual void paintArrowButtonForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintProgressBarForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSeparatorForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSplitPaneDividerForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSplitPaneDragDivider(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintTreeCellFocus(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintArrowButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintArrowButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintCheckBoxBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintCheckBoxBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintCheckBoxMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintCheckBoxMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintColorChooserBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintColorChooserBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintComboBoxBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintComboBoxBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintDesktopIconBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintDesktopIconBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintDesktopPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintDesktopPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintEditorPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintEditorPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintFileChooserBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintFileChooserBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintFormattedTextFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintFormattedTextFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintInternalFrameBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintInternalFrameBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintInternalFrameTitlePaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintInternalFrameTitlePaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintLabelBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintLabelBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintListBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintListBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintOptionPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintOptionPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPanelBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPanelBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPasswordFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPasswordFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPopupMenuBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPopupMenuBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintProgressBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintProgressBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRadioButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRadioButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRadioButtonMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRadioButtonMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRootPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRootPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollBarThumbBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintScrollBarThumbBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintScrollBarTrackBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollBarTrackBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSeparatorBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSeparatorBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSliderBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSliderBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSliderThumbBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSliderThumbBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSliderTrackBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSliderTrackBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSpinnerBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSpinnerBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSplitPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSplitPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSplitPaneDividerBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneContentBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneContentBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneTabAreaBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneTabAreaBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneTabBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintTabbedPaneTabBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintTableBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTableBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTableHeaderBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTableHeaderBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextAreaBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextAreaBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToggleButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToggleButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarContentBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarContentBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarDragWindowBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarDragWindowBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolTipBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolTipBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTreeBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTreeBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTreeCellBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTreeCellBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintViewportBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintViewportBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthPainter__
diff --git a/libjava/javax/swing/plaf/synth/SynthStyle.h b/libjava/javax/swing/plaf/synth/SynthStyle.h
deleted file mode 100644
index b8779f2b394..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthStyle.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthStyle__
-#define __javax_swing_plaf_synth_SynthStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace synth
-        {
-            class ColorType;
-            class SynthContext;
-            class SynthGraphicsUtils;
-            class SynthPainter;
-            class SynthStyle;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthStyle : public ::java::lang::Object
-{
-
-public:
-  SynthStyle();
-  virtual ::javax::swing::plaf::synth::SynthGraphicsUtils * getGraphicsUtils(::javax::swing::plaf::synth::SynthContext *);
-  virtual ::java::awt::Color * getColor(::javax::swing::plaf::synth::SynthContext *, ::javax::swing::plaf::synth::ColorType *);
-public: // actually protected
-  virtual ::java::awt::Color * getColorForState(::javax::swing::plaf::synth::SynthContext *, ::javax::swing::plaf::synth::ColorType *) = 0;
-public:
-  virtual ::java::awt::Font * getFont(::javax::swing::plaf::synth::SynthContext *);
-public: // actually protected
-  virtual ::java::awt::Font * getFontForState(::javax::swing::plaf::synth::SynthContext *) = 0;
-public:
-  virtual ::java::awt::Insets * getInsets(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Insets *);
-  virtual ::javax::swing::plaf::synth::SynthPainter * getPainter(::javax::swing::plaf::synth::SynthContext *);
-  virtual jboolean isOpaque(::javax::swing::plaf::synth::SynthContext *);
-  virtual ::java::lang::Object * get(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *);
-  virtual void installDefaults(::javax::swing::plaf::synth::SynthContext *);
-  virtual void uninstallDefaults(::javax::swing::plaf::synth::SynthContext *);
-  virtual jint getInt(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, jint);
-  virtual jboolean getBoolean(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, jboolean);
-  virtual ::javax::swing::Icon * getIcon(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *);
-  virtual ::java::lang::String * getString(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthStyle__
diff --git a/libjava/javax/swing/plaf/synth/SynthStyleFactory.h b/libjava/javax/swing/plaf/synth/SynthStyleFactory.h
deleted file mode 100644
index 2f6905676a7..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthStyleFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthStyleFactory__
-#define __javax_swing_plaf_synth_SynthStyleFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-        namespace synth
-        {
-            class Region;
-            class SynthStyle;
-            class SynthStyleFactory;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthStyleFactory : public ::java::lang::Object
-{
-
-public:
-  SynthStyleFactory();
-  virtual ::javax::swing::plaf::synth::SynthStyle * getStyle(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthStyleFactory__
diff --git a/libjava/javax/swing/table/AbstractTableModel.h b/libjava/javax/swing/table/AbstractTableModel.h
deleted file mode 100644
index 307aa95f9d6..00000000000
--- a/libjava/javax/swing/table/AbstractTableModel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_AbstractTableModel__
-#define __javax_swing_table_AbstractTableModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class EventListenerList;
-          class TableModelEvent;
-          class TableModelListener;
-      }
-      namespace table
-      {
-          class AbstractTableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::AbstractTableModel : public ::java::lang::Object
-{
-
-public:
-  AbstractTableModel();
-  virtual ::java::lang::String * getColumnName(jint);
-  virtual jint findColumn(::java::lang::String *);
-  virtual ::java::lang::Class * getColumnClass(jint);
-  virtual jboolean isCellEditable(jint, jint);
-  virtual void setValueAt(::java::lang::Object *, jint, jint);
-  virtual void addTableModelListener(::javax::swing::event::TableModelListener *);
-  virtual void removeTableModelListener(::javax::swing::event::TableModelListener *);
-  virtual JArray< ::javax::swing::event::TableModelListener * > * getTableModelListeners();
-  virtual void fireTableDataChanged();
-  virtual void fireTableStructureChanged();
-  virtual void fireTableRowsInserted(jint, jint);
-  virtual void fireTableRowsUpdated(jint, jint);
-  virtual void fireTableRowsDeleted(jint, jint);
-  virtual void fireTableCellUpdated(jint, jint);
-  virtual void fireTableChanged(::javax::swing::event::TableModelEvent *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual jint getRowCount() = 0;
-  virtual jint getColumnCount() = 0;
-  virtual ::java::lang::Object * getValueAt(jint, jint) = 0;
-public: // actually package-private
-  static const jlong serialVersionUID = -5798593159423650347LL;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_AbstractTableModel__
diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h b/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h
deleted file mode 100644
index ba101048b2a..00000000000
--- a/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_DefaultTableCellRenderer$UIResource__
-#define __javax_swing_table_DefaultTableCellRenderer$UIResource__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace table
-      {
-          class DefaultTableCellRenderer$UIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::table::DefaultTableCellRenderer$UIResource : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  DefaultTableCellRenderer$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_DefaultTableCellRenderer$UIResource__
diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer.h b/libjava/javax/swing/table/DefaultTableCellRenderer.h
deleted file mode 100644
index 7865b5a4a99..00000000000
--- a/libjava/javax/swing/table/DefaultTableCellRenderer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_DefaultTableCellRenderer__
-#define __javax_swing_table_DefaultTableCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-      namespace border
-      {
-          class Border;
-      }
-      namespace table
-      {
-          class DefaultTableCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::table::DefaultTableCellRenderer : public ::javax::swing::JLabel
-{
-
-public:
-  DefaultTableCellRenderer();
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void updateUI();
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-  virtual jboolean isOpaque();
-  virtual void validate();
-  virtual void revalidate();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void repaint(::java::awt::Rectangle *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-public: // actually protected
-  virtual void setValue(::java::lang::Object *);
-public: // actually package-private
-  static const jlong serialVersionUID = 7878911414715528324LL;
-public: // actually protected
-  static ::javax::swing::border::Border * noFocusBorder;
-public: // actually package-private
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) foreground;
-  ::java::awt::Color * background;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_DefaultTableCellRenderer__
diff --git a/libjava/javax/swing/table/DefaultTableColumnModel.h b/libjava/javax/swing/table/DefaultTableColumnModel.h
deleted file mode 100644
index bdbb4e7758c..00000000000
--- a/libjava/javax/swing/table/DefaultTableColumnModel.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_DefaultTableColumnModel__
-#define __javax_swing_table_DefaultTableColumnModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ListSelectionModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class EventListenerList;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-          class TableColumnModelListener;
-      }
-      namespace table
-      {
-          class DefaultTableColumnModel;
-          class TableColumn;
-      }
-    }
-  }
-}
-
-class javax::swing::table::DefaultTableColumnModel : public ::java::lang::Object
-{
-
-public:
-  DefaultTableColumnModel();
-  virtual void addColumn(::javax::swing::table::TableColumn *);
-  virtual void removeColumn(::javax::swing::table::TableColumn *);
-  virtual void moveColumn(jint, jint);
-  virtual void setColumnMargin(jint);
-  virtual jint getColumnCount();
-  virtual ::java::util::Enumeration * getColumns();
-  virtual jint getColumnIndex(::java::lang::Object *);
-  virtual ::javax::swing::table::TableColumn * getColumn(jint);
-  virtual jint getColumnMargin();
-  virtual jint getColumnIndexAtX(jint);
-  virtual jint getTotalColumnWidth();
-  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
-  virtual void setColumnSelectionAllowed(jboolean);
-  virtual jboolean getColumnSelectionAllowed();
-  virtual JArray< jint > * getSelectedColumns();
-  virtual jint getSelectedColumnCount();
-  virtual void addColumnModelListener(::javax::swing::event::TableColumnModelListener *);
-  virtual void removeColumnModelListener(::javax::swing::event::TableColumnModelListener *);
-  virtual JArray< ::javax::swing::event::TableColumnModelListener * > * getColumnModelListeners();
-public: // actually protected
-  virtual void fireColumnAdded(::javax::swing::event::TableColumnModelEvent *);
-  virtual void fireColumnRemoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void fireColumnMoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void fireColumnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void fireColumnMarginChanged();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually protected
-  virtual ::javax::swing::ListSelectionModel * createSelectionModel();
-  virtual void recalcWidthCache();
-private:
-  void invalidateWidthCache();
-  static const jlong serialVersionUID = 6580012493508960512LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tableColumns;
-  ::javax::swing::ListSelectionModel * selectionModel;
-  jint columnMargin;
-  ::javax::swing::event::EventListenerList * listenerList;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  jboolean columnSelectionAllowed;
-  jint totalColumnWidth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_DefaultTableColumnModel__
diff --git a/libjava/javax/swing/table/DefaultTableModel.h b/libjava/javax/swing/table/DefaultTableModel.h
deleted file mode 100644
index a5f3bd4eca8..00000000000
--- a/libjava/javax/swing/table/DefaultTableModel.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_DefaultTableModel__
-#define __javax_swing_table_DefaultTableModel__
-
-#pragma interface
-
-#include <javax/swing/table/AbstractTableModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableModelEvent;
-      }
-      namespace table
-      {
-          class DefaultTableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::DefaultTableModel : public ::javax::swing::table::AbstractTableModel
-{
-
-public:
-  DefaultTableModel();
-  DefaultTableModel(jint, jint);
-  DefaultTableModel(::java::util::Vector *, jint);
-  DefaultTableModel(JArray< ::java::lang::Object * > *, jint);
-  DefaultTableModel(::java::util::Vector *, ::java::util::Vector *);
-  DefaultTableModel(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
-  virtual ::java::util::Vector * getDataVector();
-  virtual void setDataVector(::java::util::Vector *, ::java::util::Vector *);
-  virtual void setDataVector(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
-  virtual void newDataAvailable(::javax::swing::event::TableModelEvent *);
-  virtual void newRowsAdded(::javax::swing::event::TableModelEvent *);
-  virtual void rowsRemoved(::javax::swing::event::TableModelEvent *);
-  virtual void setColumnIdentifiers(::java::util::Vector *);
-  virtual void setColumnIdentifiers(JArray< ::java::lang::Object * > *);
-  virtual void setNumRows(jint);
-  virtual void setRowCount(jint);
-  virtual void setColumnCount(jint);
-  virtual void addColumn(::java::lang::Object *);
-  virtual void addColumn(::java::lang::Object *, ::java::util::Vector *);
-  virtual void addColumn(::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  virtual void addRow(::java::util::Vector *);
-  virtual void addRow(JArray< ::java::lang::Object * > *);
-  virtual void insertRow(jint, ::java::util::Vector *);
-  virtual void insertRow(jint, JArray< ::java::lang::Object * > *);
-  virtual void moveRow(jint, jint, jint);
-  virtual void removeRow(jint);
-  virtual jint getRowCount();
-  virtual jint getColumnCount();
-  virtual ::java::lang::String * getColumnName(jint);
-  virtual jboolean isCellEditable(jint, jint);
-  virtual ::java::lang::Object * getValueAt(jint, jint);
-  virtual void setValueAt(::java::lang::Object *, jint, jint);
-public: // actually protected
-  static ::java::util::Vector * convertToVector(JArray< ::java::lang::Object * > *);
-  static ::java::util::Vector * convertToVector(JArray< JArray< ::java::lang::Object * > * > *);
-private:
-  void addExtraRows(jint, jint);
-  void checkSize();
-public: // actually package-private
-  static const jlong serialVersionUID = 6680042567037222321LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::table::AbstractTableModel)))) dataVector;
-  ::java::util::Vector * columnIdentifiers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_DefaultTableModel__
diff --git a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h b/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h
deleted file mode 100644
index c5febbb2c65..00000000000
--- a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
-#define __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleAction;
-        class AccessibleComponent;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-        class AccessibleText;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JTable;
-      namespace table
-      {
-          class JTableHeader;
-          class JTableHeader$AccessibleJTableHeader;
-          class JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry;
-      }
-    }
-  }
-}
-
-class javax::swing::table::JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry : public ::javax::accessibility::AccessibleContext
-{
-
-public:
-  JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry(::javax::swing::table::JTableHeader$AccessibleJTableHeader *, jint, ::javax::swing::table::JTableHeader *, ::javax::swing::JTable *);
-public: // actually package-private
-  virtual ::java::awt::Component * getColumnHeaderRenderer();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleColumnHeaderRenderer();
-public:
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual jint getAccessibleIndexInParent();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Cursor * getCursor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::awt::Point * getLocation();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getSize();
-  virtual jboolean isEnabled();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isShowing();
-  virtual jboolean isVisible();
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void requestFocus();
-  virtual void setAccessibleDescription(::java::lang::String *);
-  virtual void setAccessibleName(::java::lang::String *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setVisible(jboolean);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) columnIndex;
-  ::javax::swing::table::JTableHeader * parent;
-  ::javax::swing::JTable * table;
-public: // actually package-private
-  ::javax::swing::table::JTableHeader$AccessibleJTableHeader * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
diff --git a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h b/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h
deleted file mode 100644
index 64fd44e7156..00000000000
--- a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_JTableHeader$AccessibleJTableHeader__
-#define __javax_swing_table_JTableHeader$AccessibleJTableHeader__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-      namespace table
-      {
-          class JTableHeader;
-          class JTableHeader$AccessibleJTableHeader;
-      }
-    }
-  }
-}
-
-class javax::swing::table::JTableHeader$AccessibleJTableHeader : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JTableHeader$AccessibleJTableHeader(::javax::swing::table::JTableHeader *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-public: // actually package-private
-  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_JTableHeader$AccessibleJTableHeader__
diff --git a/libjava/javax/swing/table/JTableHeader.h b/libjava/javax/swing/table/JTableHeader.h
deleted file mode 100644
index 0c92ad30aa3..00000000000
--- a/libjava/javax/swing/table/JTableHeader.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_JTableHeader__
-#define __javax_swing_table_JTableHeader__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JTable;
-      namespace event
-      {
-          class ChangeEvent;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-      }
-      namespace plaf
-      {
-          class TableHeaderUI;
-      }
-      namespace table
-      {
-          class JTableHeader;
-          class TableCellRenderer;
-          class TableColumn;
-          class TableColumnModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::JTableHeader : public ::javax::swing::JComponent
-{
-
-public:
-  JTableHeader();
-  JTableHeader(::javax::swing::table::TableColumnModel *);
-public: // actually protected
-  virtual ::javax::swing::table::TableColumnModel * createDefaultColumnModel();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::table::TableColumnModel * getColumnModel();
-  virtual ::javax::swing::table::TableColumn * getDraggedColumn();
-  virtual jint getDraggedDistance();
-  virtual jboolean getReorderingAllowed();
-  virtual jboolean getResizingAllowed();
-  virtual ::javax::swing::table::TableColumn * getResizingColumn();
-  virtual ::javax::swing::JTable * getTable();
-  virtual jboolean getUpdateTableInRealTime();
-  virtual jboolean isOpaque();
-  virtual void setColumnModel(::javax::swing::table::TableColumnModel *);
-  virtual void setDraggedColumn(::javax::swing::table::TableColumn *);
-  virtual void setDraggedDistance(jint);
-  virtual void setOpaque(jboolean);
-  virtual void setReorderingAllowed(jboolean);
-  virtual void setResizingAllowed(jboolean);
-  virtual void setResizingColumn(::javax::swing::table::TableColumn *);
-  virtual void setTable(::javax::swing::JTable *);
-  virtual void setUpdateTableInRealTime(jboolean);
-public: // actually protected
-  virtual ::javax::swing::table::TableCellRenderer * createDefaultRenderer();
-public:
-  virtual ::javax::swing::table::TableCellRenderer * getDefaultRenderer();
-  virtual void setDefaultRenderer(::javax::swing::table::TableCellRenderer *);
-  virtual ::java::awt::Rectangle * getHeaderRect(jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::plaf::TableHeaderUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TableHeaderUI *);
-  virtual void updateUI();
-  virtual jint columnAtPoint(::java::awt::Point *);
-  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
-  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void resizeAndRepaint();
-public: // actually protected
-  virtual void initializeLocalVars();
-private:
-  static const jlong serialVersionUID = 5144633983372967710LL;
-public: // actually protected
-  ::javax::swing::table::TableColumnModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) columnModel;
-  ::javax::swing::table::TableColumn * draggedColumn;
-  jint draggedDistance;
-public: // actually package-private
-  jboolean opaque;
-public: // actually protected
-  jboolean reorderingAllowed;
-  jboolean resizingAllowed;
-  ::javax::swing::table::TableColumn * resizingColumn;
-  ::javax::swing::JTable * table;
-  jboolean updateTableInRealTime;
-public: // actually package-private
-  ::javax::swing::table::TableCellRenderer * cellRenderer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_JTableHeader__
diff --git a/libjava/javax/swing/table/TableCellEditor.h b/libjava/javax/swing/table/TableCellEditor.h
deleted file mode 100644
index a84088452c5..00000000000
--- a/libjava/javax/swing/table/TableCellEditor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableCellEditor__
-#define __javax_swing_table_TableCellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-      namespace event
-      {
-          class CellEditorListener;
-      }
-      namespace table
-      {
-          class TableCellEditor;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableCellEditor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getTableCellEditorComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jint, jint) = 0;
-  virtual ::java::lang::Object * getCellEditorValue() = 0;
-  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
-  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
-  virtual jboolean stopCellEditing() = 0;
-  virtual void cancelCellEditing() = 0;
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_table_TableCellEditor__
diff --git a/libjava/javax/swing/table/TableCellRenderer.h b/libjava/javax/swing/table/TableCellRenderer.h
deleted file mode 100644
index 46e7eff87a4..00000000000
--- a/libjava/javax/swing/table/TableCellRenderer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableCellRenderer__
-#define __javax_swing_table_TableCellRenderer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-      namespace table
-      {
-          class TableCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableCellRenderer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_table_TableCellRenderer__
diff --git a/libjava/javax/swing/table/TableColumn.h b/libjava/javax/swing/table/TableColumn.h
deleted file mode 100644
index 11ca5758b6f..00000000000
--- a/libjava/javax/swing/table/TableColumn.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableColumn__
-#define __javax_swing_table_TableColumn__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class SwingPropertyChangeSupport;
-      }
-      namespace table
-      {
-          class TableCellEditor;
-          class TableCellRenderer;
-          class TableColumn;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableColumn : public ::java::lang::Object
-{
-
-public:
-  TableColumn();
-  TableColumn(jint);
-  TableColumn(jint, jint);
-  TableColumn(jint, jint, ::javax::swing::table::TableCellRenderer *, ::javax::swing::table::TableCellEditor *);
-  virtual void setModelIndex(jint);
-  virtual jint getModelIndex();
-  virtual void setIdentifier(::java::lang::Object *);
-  virtual ::java::lang::Object * getIdentifier();
-  virtual void setHeaderValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getHeaderValue();
-  virtual void setHeaderRenderer(::javax::swing::table::TableCellRenderer *);
-  virtual ::javax::swing::table::TableCellRenderer * getHeaderRenderer();
-  virtual void setCellRenderer(::javax::swing::table::TableCellRenderer *);
-  virtual ::javax::swing::table::TableCellRenderer * getCellRenderer();
-  virtual void setCellEditor(::javax::swing::table::TableCellEditor *);
-  virtual ::javax::swing::table::TableCellEditor * getCellEditor();
-  virtual void setWidth(jint);
-  virtual jint getWidth();
-  virtual void setPreferredWidth(jint);
-  virtual jint getPreferredWidth();
-  virtual void setMinWidth(jint);
-  virtual jint getMinWidth();
-  virtual void setMaxWidth(jint);
-  virtual jint getMaxWidth();
-  virtual void setResizable(jboolean);
-  virtual jboolean getResizable();
-  virtual void sizeWidthToFit();
-  virtual void disableResizedPosting();
-  virtual void enableResizedPosting();
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-public: // actually protected
-  virtual ::javax::swing::table::TableCellRenderer * createDefaultHeaderRenderer();
-public: // actually package-private
-  static const jlong serialVersionUID = -6113660025878112608LL;
-public:
-  static ::java::lang::String * COLUMN_WIDTH_PROPERTY;
-  static ::java::lang::String * HEADER_VALUE_PROPERTY;
-  static ::java::lang::String * HEADER_RENDERER_PROPERTY;
-  static ::java::lang::String * CELL_RENDERER_PROPERTY;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) modelIndex;
-  ::java::lang::Object * identifier;
-  jint width;
-  jint minWidth;
-private:
-  jint preferredWidth;
-public: // actually protected
-  jint maxWidth;
-  ::javax::swing::table::TableCellRenderer * headerRenderer;
-  ::java::lang::Object * headerValue;
-  ::javax::swing::table::TableCellRenderer * cellRenderer;
-  ::javax::swing::table::TableCellEditor * cellEditor;
-  jboolean isResizable;
-  jint resizedPostingDisableCount;
-private:
-  ::javax::swing::event::SwingPropertyChangeSupport * changeSupport;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_TableColumn__
diff --git a/libjava/javax/swing/table/TableColumnModel.h b/libjava/javax/swing/table/TableColumnModel.h
deleted file mode 100644
index ea60322422a..00000000000
--- a/libjava/javax/swing/table/TableColumnModel.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableColumnModel__
-#define __javax_swing_table_TableColumnModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ListSelectionModel;
-      namespace event
-      {
-          class TableColumnModelListener;
-      }
-      namespace table
-      {
-          class TableColumn;
-          class TableColumnModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableColumnModel : public ::java::lang::Object
-{
-
-public:
-  virtual void addColumn(::javax::swing::table::TableColumn *) = 0;
-  virtual void removeColumn(::javax::swing::table::TableColumn *) = 0;
-  virtual void moveColumn(jint, jint) = 0;
-  virtual void setColumnMargin(jint) = 0;
-  virtual jint getColumnCount() = 0;
-  virtual ::java::util::Enumeration * getColumns() = 0;
-  virtual jint getColumnIndex(::java::lang::Object *) = 0;
-  virtual ::javax::swing::table::TableColumn * getColumn(jint) = 0;
-  virtual jint getColumnMargin() = 0;
-  virtual jint getColumnIndexAtX(jint) = 0;
-  virtual jint getTotalColumnWidth() = 0;
-  virtual void setColumnSelectionAllowed(jboolean) = 0;
-  virtual jboolean getColumnSelectionAllowed() = 0;
-  virtual JArray< jint > * getSelectedColumns() = 0;
-  virtual jint getSelectedColumnCount() = 0;
-  virtual void setSelectionModel(::javax::swing::ListSelectionModel *) = 0;
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel() = 0;
-  virtual void addColumnModelListener(::javax::swing::event::TableColumnModelListener *) = 0;
-  virtual void removeColumnModelListener(::javax::swing::event::TableColumnModelListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_table_TableColumnModel__
diff --git a/libjava/javax/swing/table/TableModel.h b/libjava/javax/swing/table/TableModel.h
deleted file mode 100644
index 29494c5e102..00000000000
--- a/libjava/javax/swing/table/TableModel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableModel__
-#define __javax_swing_table_TableModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableModelListener;
-      }
-      namespace table
-      {
-          class TableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableModel : public ::java::lang::Object
-{
-
-public:
-  virtual jint getRowCount() = 0;
-  virtual jint getColumnCount() = 0;
-  virtual ::java::lang::String * getColumnName(jint) = 0;
-  virtual ::java::lang::Class * getColumnClass(jint) = 0;
-  virtual jboolean isCellEditable(jint, jint) = 0;
-  virtual ::java::lang::Object * getValueAt(jint, jint) = 0;
-  virtual void setValueAt(::java::lang::Object *, jint, jint) = 0;
-  virtual void addTableModelListener(::javax::swing::event::TableModelListener *) = 0;
-  virtual void removeTableModelListener(::javax::swing::event::TableModelListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_table_TableModel__
diff --git a/libjava/javax/swing/text/AbstractDocument$AbstractElement.h b/libjava/javax/swing/text/AbstractDocument$AbstractElement.h
deleted file mode 100644
index 1aae4dc3660..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$AbstractElement.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$AbstractElement__
-#define __javax_swing_text_AbstractDocument$AbstractElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$AbstractElement;
-          class AttributeSet;
-          class Document;
-          class Element;
-      }
-      namespace tree
-      {
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$AbstractElement : public ::java::lang::Object
-{
-
-public:
-  AbstractDocument$AbstractElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-  virtual ::java::util::Enumeration * children() = 0;
-  virtual jboolean getAllowsChildren() = 0;
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
-  virtual jint getChildCount();
-  virtual jint getIndex(::javax::swing::tree::TreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getParent();
-  virtual jboolean isLeaf() = 0;
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual void addAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttribute(::java::lang::Object *);
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttributes(::java::util::Enumeration *);
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::swing::text::Element * getElement(jint) = 0;
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::text::Element * getParentElement();
-  virtual jint getEndOffset() = 0;
-  virtual jint getElementCount() = 0;
-  virtual jint getElementIndex(jint) = 0;
-  virtual jint getStartOffset() = 0;
-  virtual void dump(::java::io::PrintStream *, jint);
-private:
-  static const jlong serialVersionUID = 1712240033321461704LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  jint offset;
-  ::javax::swing::text::AttributeSet * attributes;
-  ::javax::swing::text::Element * element_parent;
-  ::javax::swing::tree::TreeNode * tree_parent;
-  ::java::util::Vector * tree_children;
-  ::javax::swing::text::AbstractDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$AbstractElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$AttributeContext.h b/libjava/javax/swing/text/AbstractDocument$AttributeContext.h
deleted file mode 100644
index d02f88831e1..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$AttributeContext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$AttributeContext__
-#define __javax_swing_text_AbstractDocument$AttributeContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$AttributeContext;
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$AttributeContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * getEmptySet() = 0;
-  virtual void reclaim(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *) = 0;
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AbstractDocument$AttributeContext__
diff --git a/libjava/javax/swing/text/AbstractDocument$BidiElement.h b/libjava/javax/swing/text/AbstractDocument$BidiElement.h
deleted file mode 100644
index 4d8a0c8dfca..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$BidiElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$BidiElement__
-#define __javax_swing_text_AbstractDocument$BidiElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$LeafElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$BidiElement;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$BidiElement : public ::javax::swing::text::AbstractDocument$LeafElement
-{
-
-public: // actually package-private
-  AbstractDocument$BidiElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, jint, jint, jint);
-public:
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$LeafElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$BidiElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h b/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h
deleted file mode 100644
index b9a908b7ba1..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$BidiRootElement__
-#define __javax_swing_text_AbstractDocument$BidiRootElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$BranchElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$BidiRootElement;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$BidiRootElement : public ::javax::swing::text::AbstractDocument$BranchElement
-{
-
-public: // actually package-private
-  AbstractDocument$BidiRootElement(::javax::swing::text::AbstractDocument *);
-public:
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$BidiRootElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$BranchElement.h b/libjava/javax/swing/text/AbstractDocument$BranchElement.h
deleted file mode 100644
index 1fb3a680aff..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$BranchElement.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$BranchElement__
-#define __javax_swing_text_AbstractDocument$BranchElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$AbstractElement.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$BranchElement;
-          class AttributeSet;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$BranchElement : public ::javax::swing::text::AbstractDocument$AbstractElement
-{
-
-public:
-  AbstractDocument$BranchElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-  virtual ::java::util::Enumeration * children();
-  virtual jboolean getAllowsChildren();
-  virtual ::javax::swing::text::Element * getElement(jint);
-  virtual jint getElementCount();
-  virtual jint getElementIndex(jint);
-  virtual jint getEndOffset();
-  virtual ::java::lang::String * getName();
-  virtual jint getStartOffset();
-  virtual jboolean isLeaf();
-  virtual ::javax::swing::text::Element * positionToElement(jint);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::Element * > *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6037216547466333183LL;
-  JArray< ::javax::swing::text::Element * > * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$AbstractElement)))) children__;
-  jint numChildren;
-  jint lastIndex;
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$BranchElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$Bypass.h b/libjava/javax/swing/text/AbstractDocument$Bypass.h
deleted file mode 100644
index bb850d91e09..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$Bypass.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$Bypass__
-#define __javax_swing_text_AbstractDocument$Bypass__
-
-#pragma interface
-
-#include <javax/swing/text/DocumentFilter$FilterBypass.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$Bypass;
-          class AttributeSet;
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$Bypass : public ::javax::swing::text::DocumentFilter$FilterBypass
-{
-
-public: // actually package-private
-  AbstractDocument$Bypass(::javax::swing::text::AbstractDocument *);
-public:
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-  virtual void remove(jint, jint);
-  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::DocumentFilter$FilterBypass)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$Bypass__
diff --git a/libjava/javax/swing/text/AbstractDocument$Content.h b/libjava/javax/swing/text/AbstractDocument$Content.h
deleted file mode 100644
index be16e410b1b..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$Content.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$Content__
-#define __javax_swing_text_AbstractDocument$Content__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$Content;
-          class Position;
-          class Segment;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$Content : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
-  virtual jint length() = 0;
-  virtual ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *) = 0;
-  virtual ::javax::swing::undo::UndoableEdit * remove(jint, jint) = 0;
-  virtual ::java::lang::String * getString(jint, jint) = 0;
-  virtual void getChars(jint, jint, ::javax::swing::text::Segment *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AbstractDocument$Content__
diff --git a/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h b/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h
deleted file mode 100644
index ab7c2a01ccf..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
-#define __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
-
-#pragma interface
-
-#include <javax/swing/undo/CompoundEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent$ElementChange;
-          class DocumentEvent$EventType;
-      }
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$DefaultDocumentEvent;
-          class Document;
-          class Element;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$DefaultDocumentEvent : public ::javax::swing::undo::CompoundEdit
-{
-
-public:
-  AbstractDocument$DefaultDocumentEvent(::javax::swing::text::AbstractDocument *, jint, jint, ::javax::swing::event::DocumentEvent$EventType *);
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual jint getLength();
-  virtual jint getOffset();
-  virtual ::javax::swing::event::DocumentEvent$EventType * getType();
-  virtual ::javax::swing::event::DocumentEvent$ElementChange * getChange(::javax::swing::text::Element *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5230037221564563284LL;
-  static const jint THRESHOLD = 10;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::CompoundEdit)))) offset;
-  jint length;
-  ::javax::swing::event::DocumentEvent$EventType * type;
-  ::java::util::HashMap * changes;
-  jboolean modified;
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
diff --git a/libjava/javax/swing/text/AbstractDocument$ElementEdit.h b/libjava/javax/swing/text/AbstractDocument$ElementEdit.h
deleted file mode 100644
index 68eb020d11b..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$ElementEdit.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$ElementEdit__
-#define __javax_swing_text_AbstractDocument$ElementEdit__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$ElementEdit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$ElementEdit : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  AbstractDocument$ElementEdit(::javax::swing::text::Element *, jint, JArray< ::javax::swing::text::Element * > *, JArray< ::javax::swing::text::Element * > *);
-  virtual JArray< ::javax::swing::text::Element * > * getChildrenAdded();
-  virtual JArray< ::javax::swing::text::Element * > * getChildrenRemoved();
-  virtual ::javax::swing::text::Element * getElement();
-  virtual jint getIndex();
-private:
-  static const jlong serialVersionUID = -1216620962142928304LL;
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) elem;
-  jint index;
-  JArray< ::javax::swing::text::Element * > * removed;
-  JArray< ::javax::swing::text::Element * > * added;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$ElementEdit__
diff --git a/libjava/javax/swing/text/AbstractDocument$LeafElement.h b/libjava/javax/swing/text/AbstractDocument$LeafElement.h
deleted file mode 100644
index 0b8d671b6ce..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$LeafElement.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$LeafElement__
-#define __javax_swing_text_AbstractDocument$LeafElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$AbstractElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$LeafElement;
-          class AttributeSet;
-          class Element;
-          class Position;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$LeafElement : public ::javax::swing::text::AbstractDocument$AbstractElement
-{
-
-public:
-  AbstractDocument$LeafElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
-  virtual ::java::util::Enumeration * children();
-  virtual jboolean getAllowsChildren();
-  virtual ::javax::swing::text::Element * getElement(jint);
-  virtual jint getElementCount();
-  virtual jint getElementIndex(jint);
-  virtual jint getEndOffset();
-  virtual ::java::lang::String * getName();
-  virtual jint getStartOffset();
-  virtual jboolean isLeaf();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -8906306331347768017LL;
-  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$AbstractElement)))) startPos;
-  ::javax::swing::text::Position * endPos;
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$LeafElement__
diff --git a/libjava/javax/swing/text/AbstractDocument.h b/libjava/javax/swing/text/AbstractDocument.h
deleted file mode 100644
index 65110f0cee7..00000000000
--- a/libjava/javax/swing/text/AbstractDocument.h
+++ /dev/null
@@ -1,166 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument__
-#define __javax_swing_text_AbstractDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Bidi;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentListener;
-          class EventListenerList;
-          class UndoableEditEvent;
-          class UndoableEditListener;
-      }
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$AttributeContext;
-          class AbstractDocument$BidiRootElement;
-          class AbstractDocument$Content;
-          class AbstractDocument$DefaultDocumentEvent;
-          class AttributeSet;
-          class DocumentFilter;
-          class DocumentFilter$FilterBypass;
-          class Element;
-          class Position;
-          class Segment;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractDocument(::javax::swing::text::AbstractDocument$Content *);
-  AbstractDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::AbstractDocument$AttributeContext *);
-private:
-  ::javax::swing::text::DocumentFilter$FilterBypass * getBypass();
-public:
-  virtual ::javax::swing::text::Element * getParagraphElement(jint) = 0;
-  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
-public: // actually protected
-  virtual ::javax::swing::text::Element * createBranchElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::Element * createLeafElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
-public:
-  virtual ::javax::swing::text::Position * createPosition(jint);
-public: // actually protected
-  virtual void fireChangedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void fireInsertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void fireRemoveUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void fireUndoableEditUpdate(::javax::swing::event::UndoableEditEvent *);
-public:
-  virtual jint getAsynchronousLoadPriority();
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$AttributeContext * getAttributeContext();
-public:
-  virtual ::javax::swing::text::Element * getBidiRootElement();
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$Content * getContent();
-  virtual ::java::lang::Thread * getCurrentWriter();
-public:
-  virtual ::java::util::Dictionary * getDocumentProperties();
-  virtual ::javax::swing::text::Position * getEndPosition();
-  virtual jint getLength();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual ::java::lang::Object * getProperty(::java::lang::Object *);
-  virtual JArray< ::javax::swing::text::Element * > * getRootElements();
-  virtual ::javax::swing::text::Position * getStartPosition();
-  virtual ::java::lang::String * getText(jint, jint);
-  virtual void getText(jint, jint, ::javax::swing::text::Segment *);
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  virtual void insertStringImpl(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public: // actually protected
-  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
-  virtual void postRemoveUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public:
-  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *);
-private:
-  void updateBidi(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-  JArray< ::java::text::Bidi * > * getBidis(jint, jint);
-public:
-  virtual void readLock();
-  virtual void readUnlock();
-  virtual void remove(jint, jint);
-public: // actually package-private
-  virtual void removeImpl(jint, jint);
-public:
-  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  virtual void replaceImpl(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public:
-  virtual void addDocumentListener(::javax::swing::event::DocumentListener *);
-  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *);
-  virtual JArray< ::javax::swing::event::DocumentListener * > * getDocumentListeners();
-  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *);
-  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *);
-  virtual JArray< ::javax::swing::event::UndoableEditListener * > * getUndoableEditListeners();
-public: // actually protected
-  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public:
-  virtual void render(::java::lang::Runnable *);
-  virtual void setAsynchronousLoadPriority(jint);
-  virtual void setDocumentProperties(::java::util::Dictionary *);
-public: // actually protected
-  virtual void writeLock();
-  virtual void writeUnlock();
-public:
-  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
-  virtual void setDocumentFilter(::javax::swing::text::DocumentFilter *);
-  virtual void dump(::java::io::PrintStream *);
-private:
-  static const jlong serialVersionUID = 6842927725919637215LL;
-public: // actually protected
-  static ::java::lang::String * BAD_LOCATION;
-public:
-  static ::java::lang::String * BidiElementName;
-  static ::java::lang::String * ContentElementName;
-  static ::java::lang::String * ParagraphElementName;
-  static ::java::lang::String * SectionElementName;
-  static ::java::lang::String * ElementNameAttribute;
-private:
-  static ::java::lang::String * BidiRootName;
-  static ::java::lang::String * AsyncLoadPriority;
-  static ::java::lang::String * I18N;
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument$Content * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
-  ::javax::swing::text::AbstractDocument$AttributeContext * context;
-  ::javax::swing::text::DocumentFilter * documentFilter;
-  ::java::util::Dictionary * properties;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  ::java::lang::Thread * currentWriter;
-  jint numReaders;
-  jint numWriters;
-  ::javax::swing::text::DocumentFilter$FilterBypass * bypass;
-  ::javax::swing::text::AbstractDocument$BidiRootElement * bidiRoot;
-  jboolean notifyListeners;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument__
diff --git a/libjava/javax/swing/text/AbstractWriter.h b/libjava/javax/swing/text/AbstractWriter.h
deleted file mode 100644
index b22be6e6fa1..00000000000
--- a/libjava/javax/swing/text/AbstractWriter.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractWriter__
-#define __javax_swing_text_AbstractWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractWriter;
-          class AttributeSet;
-          class Document;
-          class Element;
-          class ElementIterator;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractWriter : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Document *);
-  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
-  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Element *);
-  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Element *, jint, jint);
-  virtual ::javax::swing::text::ElementIterator * getElementIterator();
-  virtual ::java::io::Writer * getWriter();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual void write() = 0;
-  virtual ::java::lang::String * getText(::javax::swing::text::Element *);
-  virtual void output(JArray< jchar > *, jint, jint);
-  virtual void writeLineSeparator();
-  virtual void write(jchar);
-  virtual void write(::java::lang::String *);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void indent();
-public:
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-public: // actually protected
-  virtual jboolean inRange(::javax::swing::text::Element *);
-  virtual void text(::javax::swing::text::Element *);
-  virtual void setLineLength(jint);
-  virtual jint getLineLength();
-  virtual void setCurrentLineLength(jint);
-  virtual jint getCurrentLineLength();
-  virtual jboolean isLineEmpty();
-  virtual void setCanWrapLines(jboolean);
-  virtual jboolean getCanWrapLines();
-  virtual void setIndentSpace(jint);
-  virtual jint getIndentSpace();
-public:
-  virtual void setLineSeparator(::java::lang::String *);
-  virtual ::java::lang::String * getLineSeparator();
-public: // actually protected
-  virtual void incrIndent();
-  virtual void decrIndent();
-  virtual jint getIndentLevel();
-  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
-  static const jchar NEWLINE = 10;
-private:
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
-  ::javax::swing::text::ElementIterator * iter;
-  ::javax::swing::text::Document * document;
-  jint maxLineLength;
-  jint lineLength;
-  jboolean canWrapLines;
-  jint indentSpace;
-  jint indentLevel;
-  jboolean indented;
-  jint startOffset;
-  jint endOffset;
-  ::java::lang::String * lineSeparator;
-  JArray< jchar > * lineSeparatorChars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractWriter__
diff --git a/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h b/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h
deleted file mode 100644
index 72b0f9a6c3c..00000000000
--- a/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AsyncBoxView$ChildLocator__
-#define __javax_swing_text_AsyncBoxView$ChildLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AsyncBoxView;
-          class AsyncBoxView$ChildLocator;
-          class AsyncBoxView$ChildState;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AsyncBoxView$ChildLocator : public ::java::lang::Object
-{
-
-public:
-  AsyncBoxView$ChildLocator(::javax::swing::text::AsyncBoxView *);
-  virtual void childChanged(::javax::swing::text::AsyncBoxView$ChildState *);
-  virtual jint getViewIndexAtPoint(jfloat, jfloat, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-  virtual void paintChildren(::java::awt::Graphics *);
-public: // actually protected
-  virtual ::java::awt::Shape * getChildAllocation(jint);
-  virtual void setAllocation(::java::awt::Shape *);
-  virtual jint getViewIndexAtVisualOffset(jfloat);
-private:
-  jint updateChildOffsets(jfloat);
-  void updateChildOffsetsToIndex(jint);
-public: // actually protected
-  ::javax::swing::text::AsyncBoxView$ChildState * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastValidOffset;
-  ::java::awt::Rectangle * lastAlloc;
-  ::java::awt::Rectangle * childAlloc;
-public: // actually package-private
-  ::javax::swing::text::AsyncBoxView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AsyncBoxView$ChildLocator__
diff --git a/libjava/javax/swing/text/AsyncBoxView$ChildState.h b/libjava/javax/swing/text/AsyncBoxView$ChildState.h
deleted file mode 100644
index 3bce589a205..00000000000
--- a/libjava/javax/swing/text/AsyncBoxView$ChildState.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AsyncBoxView$ChildState__
-#define __javax_swing_text_AsyncBoxView$ChildState__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AsyncBoxView;
-          class AsyncBoxView$ChildState;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AsyncBoxView$ChildState : public ::java::lang::Object
-{
-
-public:
-  AsyncBoxView$ChildState(::javax::swing::text::AsyncBoxView *, ::javax::swing::text::View *);
-  virtual ::javax::swing::text::View * getChildView();
-  virtual jboolean isLayoutValid();
-  virtual void run();
-private:
-  void update();
-public:
-  virtual jfloat getMinorSpan();
-  virtual jfloat getMinorOffset();
-  virtual jfloat getMajorSpan();
-  virtual jfloat getMajorOffset();
-  virtual void setMajorOffset(jfloat);
-  virtual void preferenceChanged(jboolean, jboolean);
-private:
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::java::lang::Object)))) childView;
-  jboolean minorValid;
-  jboolean majorValid;
-public: // actually package-private
-  jboolean childSizeValid;
-  jfloat minimum;
-  jfloat preferred;
-private:
-  jfloat majorSpan;
-  jfloat majorOffset;
-  jfloat minorSpan;
-  jfloat minorOffset;
-  jfloat maximum;
-public: // actually package-private
-  ::javax::swing::text::AsyncBoxView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AsyncBoxView$ChildState__
diff --git a/libjava/javax/swing/text/AsyncBoxView$FlushTask.h b/libjava/javax/swing/text/AsyncBoxView$FlushTask.h
deleted file mode 100644
index bd9378b4ead..00000000000
--- a/libjava/javax/swing/text/AsyncBoxView$FlushTask.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AsyncBoxView$FlushTask__
-#define __javax_swing_text_AsyncBoxView$FlushTask__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AsyncBoxView;
-          class AsyncBoxView$FlushTask;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AsyncBoxView$FlushTask : public ::java::lang::Object
-{
-
-  AsyncBoxView$FlushTask(::javax::swing::text::AsyncBoxView *);
-public:
-  virtual void run();
-public: // actually package-private
-  AsyncBoxView$FlushTask(::javax::swing::text::AsyncBoxView *, ::javax::swing::text::AsyncBoxView$FlushTask *);
-  ::javax::swing::text::AsyncBoxView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AsyncBoxView$FlushTask__
diff --git a/libjava/javax/swing/text/AsyncBoxView.h b/libjava/javax/swing/text/AsyncBoxView.h
deleted file mode 100644
index 80a965f49a0..00000000000
--- a/libjava/javax/swing/text/AsyncBoxView.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AsyncBoxView__
-#define __javax_swing_text_AsyncBoxView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class AsyncBoxView;
-          class AsyncBoxView$ChildLocator;
-          class AsyncBoxView$ChildState;
-          class Element;
-          class LayoutQueue;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AsyncBoxView : public ::javax::swing::text::View
-{
-
-public:
-  AsyncBoxView(::javax::swing::text::Element *, jint);
-  virtual jint getMajorAxis();
-  virtual jint getMinorAxis();
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual jint getViewCount();
-  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
-  virtual jfloat getTopInset();
-  virtual void setTopInset(jfloat);
-  virtual jfloat getBottomInset();
-  virtual void setBottomInset(jfloat);
-  virtual jfloat getLeftInset();
-  virtual void setLeftInset(jfloat);
-  virtual jfloat getRightInset();
-  virtual void setRightInset(jfloat);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual jfloat getInsetSpan(jint);
-  virtual void setEstimatedMajorSpan(jboolean);
-  virtual jboolean getEstimatedMajorSpan();
-  virtual void minorRequirementChange(::javax::swing::text::AsyncBoxView$ChildState *);
-  virtual void majorRequirementChange(::javax::swing::text::AsyncBoxView$ChildState *, jfloat);
-public:
-  virtual void setParent(::javax::swing::text::View *);
-  virtual void setSize(jfloat, jfloat);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-public: // actually protected
-  virtual void updateLayout(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
-  virtual ::javax::swing::text::AsyncBoxView$ChildState * getChildState(jint);
-  virtual ::javax::swing::text::LayoutQueue * getLayoutQueue();
-  virtual jint getViewIndexAtPosition(jint, ::javax::swing::text::Position$Bias *);
-  virtual ::javax::swing::text::AsyncBoxView$ChildState * createChildState(::javax::swing::text::View *);
-  virtual void flushRequirementChanges();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) majorAxis;
-  jfloat topInset;
-  jfloat bottomInset;
-  jfloat leftInset;
-  jboolean estimatedMajorSpan;
-  jfloat rightInset;
-  ::java::util::ArrayList * childStates;
-public: // actually package-private
-  ::javax::swing::text::AsyncBoxView$ChildState * changing;
-  ::javax::swing::text::AsyncBoxView$ChildState * minReq;
-  ::javax::swing::text::AsyncBoxView$ChildState * prefReq;
-private:
-  jboolean majorChanged;
-public: // actually package-private
-  jboolean minorChanged;
-  jfloat majorSpan;
-  jfloat minorSpan;
-private:
-  ::java::lang::Runnable * flushTask;
-public: // actually protected
-  ::javax::swing::text::AsyncBoxView$ChildLocator * locator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AsyncBoxView__
diff --git a/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h b/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h
deleted file mode 100644
index ddc9c19f482..00000000000
--- a/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet$CharacterAttribute__
-#define __javax_swing_text_AttributeSet$CharacterAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet$CharacterAttribute;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet$CharacterAttribute : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet$CharacterAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$ColorAttribute.h b/libjava/javax/swing/text/AttributeSet$ColorAttribute.h
deleted file mode 100644
index c04b096d06b..00000000000
--- a/libjava/javax/swing/text/AttributeSet$ColorAttribute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet$ColorAttribute__
-#define __javax_swing_text_AttributeSet$ColorAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet$ColorAttribute;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet$ColorAttribute : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet$ColorAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$FontAttribute.h b/libjava/javax/swing/text/AttributeSet$FontAttribute.h
deleted file mode 100644
index eff25222ae2..00000000000
--- a/libjava/javax/swing/text/AttributeSet$FontAttribute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet$FontAttribute__
-#define __javax_swing_text_AttributeSet$FontAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet$FontAttribute;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet$FontAttribute : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet$FontAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h b/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h
deleted file mode 100644
index 05f67c16b7e..00000000000
--- a/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet$ParagraphAttribute__
-#define __javax_swing_text_AttributeSet$ParagraphAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet$ParagraphAttribute;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet$ParagraphAttribute : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet$ParagraphAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet.h b/libjava/javax/swing/text/AttributeSet.h
deleted file mode 100644
index ba1f4d100e9..00000000000
--- a/libjava/javax/swing/text/AttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet__
-#define __javax_swing_text_AttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
-  virtual jint getAttributeCount() = 0;
-  virtual ::java::util::Enumeration * getAttributeNames() = 0;
-  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
-  virtual jboolean isDefined(::java::lang::Object *) = 0;
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
-  static ::java::lang::Object * NameAttribute;
-  static ::java::lang::Object * ResolveAttribute;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet__
diff --git a/libjava/javax/swing/text/BadLocationException.h b/libjava/javax/swing/text/BadLocationException.h
deleted file mode 100644
index 3102b7a37a5..00000000000
--- a/libjava/javax/swing/text/BadLocationException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_BadLocationException__
-#define __javax_swing_text_BadLocationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class BadLocationException;
-      }
-    }
-  }
-}
-
-class javax::swing::text::BadLocationException : public ::java::lang::Exception
-{
-
-public:
-  BadLocationException(::java::lang::String *, jint);
-  virtual jint offsetRequested();
-private:
-  static const jlong serialVersionUID = -7712259886815656766LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_BadLocationException__
diff --git a/libjava/javax/swing/text/BoxView.h b/libjava/javax/swing/text/BoxView.h
deleted file mode 100644
index c00436887f6..00000000000
--- a/libjava/javax/swing/text/BoxView.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_BoxView__
-#define __javax_swing_text_BoxView__
-
-#pragma interface
-
-#include <javax/swing/text/CompositeView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class BoxView;
-          class Element;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::BoxView : public ::javax::swing::text::CompositeView
-{
-
-public:
-  BoxView(::javax::swing::text::Element *, jint);
-  virtual jint getAxis();
-  virtual void setAxis(jint);
-  virtual void layoutChanged(jint);
-public: // actually protected
-  virtual jboolean isLayoutValid(jint);
-  virtual void paintChild(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-public:
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-private:
-  JArray< jint > * replaceLayoutArray(JArray< jint > *, jint, jint);
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-public: // actually protected
-  virtual ::javax::swing::SizeRequirements * baselineRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void baselineLayout(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *);
-  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *);
-  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *);
-  virtual void childAllocation(jint, ::java::awt::Rectangle *);
-  virtual void layout(jint, jint);
-private:
-  void layoutAxis(jint, jint);
-public: // actually protected
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual jboolean isAllocationValid();
-public:
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual void setSize(jfloat, jfloat);
-public: // actually protected
-  virtual jint getSpan(jint, jint);
-  virtual jint getOffset(jint, jint);
-public:
-  virtual jfloat getAlignment(jint);
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint getResizeWeight(jint);
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-public: // actually protected
-  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public:
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually protected
-  virtual jboolean flipEastAndWestAtEnds(jint, ::javax::swing::text::Position$Bias *);
-private:
-  void updateRequirements(jint);
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::CompositeView)))) myAxis;
-  JArray< jboolean > * layoutValid;
-  JArray< jboolean > * requirementsValid;
-  JArray< JArray< jint > * > * spans;
-  JArray< JArray< jint > * > * offsets;
-  JArray< ::javax::swing::SizeRequirements * > * requirements;
-  JArray< jint > * span;
-  ::java::awt::Rectangle * tmpRect;
-  ::java::awt::Rectangle * clipRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_BoxView__
diff --git a/libjava/javax/swing/text/Caret.h b/libjava/javax/swing/text/Caret.h
deleted file mode 100644
index 024933a0485..00000000000
--- a/libjava/javax/swing/text/Caret.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Caret__
-#define __javax_swing_text_Caret__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-          class Caret;
-          class JTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Caret : public ::java::lang::Object
-{
-
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void install(::javax::swing::text::JTextComponent *) = 0;
-  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
-  virtual jint getBlinkRate() = 0;
-  virtual void setBlinkRate(jint) = 0;
-  virtual jint getDot() = 0;
-  virtual void setDot(jint) = 0;
-  virtual void moveDot(jint) = 0;
-  virtual jint getMark() = 0;
-  virtual ::java::awt::Point * getMagicCaretPosition() = 0;
-  virtual void setMagicCaretPosition(::java::awt::Point *) = 0;
-  virtual jboolean isSelectionVisible() = 0;
-  virtual void setSelectionVisible(jboolean) = 0;
-  virtual jboolean isVisible() = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Caret__
diff --git a/libjava/javax/swing/text/ChangedCharSetException.h b/libjava/javax/swing/text/ChangedCharSetException.h
deleted file mode 100644
index d25d88cd98c..00000000000
--- a/libjava/javax/swing/text/ChangedCharSetException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ChangedCharSetException__
-#define __javax_swing_text_ChangedCharSetException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class ChangedCharSetException;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ChangedCharSetException : public ::java::io::IOException
-{
-
-public:
-  ChangedCharSetException(::java::lang::String *, jboolean);
-  virtual ::java::lang::String * getCharSetSpec();
-  virtual jboolean keyEqualsCharSet();
-private:
-  static const jlong serialVersionUID = 9119851554465432389LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::io::IOException)))) m_charSetSpec;
-  jboolean m_charSetKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ChangedCharSetException__
diff --git a/libjava/javax/swing/text/ComponentView$1.h b/libjava/javax/swing/text/ComponentView$1.h
deleted file mode 100644
index 5cdff36c835..00000000000
--- a/libjava/javax/swing/text/ComponentView$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ComponentView$1__
-#define __javax_swing_text_ComponentView$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class ComponentView;
-          class ComponentView$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ComponentView$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ComponentView$1(::javax::swing::text::ComponentView *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::swing::text::ComponentView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ComponentView$1__
diff --git a/libjava/javax/swing/text/ComponentView$Interceptor.h b/libjava/javax/swing/text/ComponentView$Interceptor.h
deleted file mode 100644
index 57a14a5abac..00000000000
--- a/libjava/javax/swing/text/ComponentView$Interceptor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ComponentView$Interceptor__
-#define __javax_swing_text_ComponentView$Interceptor__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class ComponentView;
-          class ComponentView$Interceptor;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ComponentView$Interceptor : public ::java::awt::Container
-{
-
-public: // actually package-private
-  ComponentView$Interceptor(::javax::swing::text::ComponentView *, ::java::awt::Component *);
-public:
-  virtual void invalidate();
-  virtual void doLayout();
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void show();
-  virtual void hide();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual jfloat getAlignmentX();
-  virtual jfloat getAlignmentY();
-private:
-  void maybeValidate();
-  void cacheComponentSizes();
-public: // actually package-private
-  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::java::awt::Container)))) min;
-  ::java::awt::Dimension * pref;
-  ::java::awt::Dimension * max;
-  jfloat alignX;
-  jfloat alignY;
-  ::javax::swing::text::ComponentView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ComponentView$Interceptor__
diff --git a/libjava/javax/swing/text/ComponentView.h b/libjava/javax/swing/text/ComponentView.h
deleted file mode 100644
index 0a333cf86d7..00000000000
--- a/libjava/javax/swing/text/ComponentView.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ComponentView__
-#define __javax_swing_text_ComponentView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class ComponentView;
-          class ComponentView$Interceptor;
-          class Element;
-          class Position$Bias;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ComponentView : public ::javax::swing::text::View
-{
-
-public:
-  ComponentView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::awt::Component * createComponent();
-public:
-  virtual jfloat getAlignment(jint);
-  virtual ::java::awt::Component * getComponent();
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual void setParent(::javax::swing::text::View *);
-public: // actually package-private
-  virtual void setParentImpl();
-public:
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) comp;
-  ::javax::swing::text::ComponentView$Interceptor * interceptor;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ComponentView__
diff --git a/libjava/javax/swing/text/CompositeView.h b/libjava/javax/swing/text/CompositeView.h
deleted file mode 100644
index 2e708ffa1cc..00000000000
--- a/libjava/javax/swing/text/CompositeView.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_CompositeView__
-#define __javax_swing_text_CompositeView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class CompositeView;
-          class Element;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::CompositeView : public ::javax::swing::text::View
-{
-
-public:
-  CompositeView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-public:
-  virtual void setParent(::javax::swing::text::View *);
-  virtual jint getViewCount();
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual ::java::awt::Shape * modelToView(jint, ::javax::swing::text::Position$Bias *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
-public: // actually protected
-  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *) = 0;
-  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *) = 0;
-  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *) = 0;
-  virtual void childAllocation(jint, ::java::awt::Rectangle *) = 0;
-  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
-  virtual jint getViewIndexAtPosition(jint);
-  virtual ::java::awt::Rectangle * getInsideAllocation(::java::awt::Shape *);
-  virtual void setParagraphInsets(::javax::swing::text::AttributeSet *);
-  virtual void setInsets(jshort, jshort, jshort, jshort);
-  virtual jshort getLeftInset();
-  virtual jshort getRightInset();
-  virtual jshort getTopInset();
-  virtual jshort getBottomInset();
-  virtual jint getNextNorthSouthVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getNextEastWestVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jboolean flipEastAndWestAtEnds(jint, ::javax::swing::text::Position$Bias *);
-private:
-  JArray< ::javax::swing::text::View * > * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) children;
-  jint numChildren;
-  ::java::awt::Rectangle * insideAllocation;
-  jshort top;
-  jshort bottom;
-  jshort left;
-  jshort right;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_CompositeView__
diff --git a/libjava/javax/swing/text/DateFormatter.h b/libjava/javax/swing/text/DateFormatter.h
deleted file mode 100644
index 47da776dacb..00000000000
--- a/libjava/javax/swing/text/DateFormatter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DateFormatter__
-#define __javax_swing_text_DateFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/InternationalFormatter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DateFormatter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DateFormatter : public ::javax::swing::text::InternationalFormatter
-{
-
-public:
-  DateFormatter();
-  DateFormatter(::java::text::DateFormat *);
-  virtual void setFormat(::java::text::DateFormat *);
-private:
-  static const jlong serialVersionUID = 5423279572591848797LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DateFormatter__
diff --git a/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h b/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h
deleted file mode 100644
index a29c4aaa2bf..00000000000
--- a/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret$BlinkTimerListener__
-#define __javax_swing_text_DefaultCaret$BlinkTimerListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultCaret;
-          class DefaultCaret$BlinkTimerListener;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret$BlinkTimerListener : public ::java::lang::Object
-{
-
-  DefaultCaret$BlinkTimerListener(::javax::swing::text::DefaultCaret *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  DefaultCaret$BlinkTimerListener(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$BlinkTimerListener *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) ignoreNextEvent;
-  ::javax::swing::text::DefaultCaret * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret$BlinkTimerListener__
diff --git a/libjava/javax/swing/text/DefaultCaret$Bypass.h b/libjava/javax/swing/text/DefaultCaret$Bypass.h
deleted file mode 100644
index 045d191f153..00000000000
--- a/libjava/javax/swing/text/DefaultCaret$Bypass.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret$Bypass__
-#define __javax_swing_text_DefaultCaret$Bypass__
-
-#pragma interface
-
-#include <javax/swing/text/NavigationFilter$FilterBypass.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultCaret;
-          class DefaultCaret$Bypass;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret$Bypass : public ::javax::swing::text::NavigationFilter$FilterBypass
-{
-
-public: // actually package-private
-  DefaultCaret$Bypass(::javax::swing::text::DefaultCaret *);
-public:
-  virtual ::javax::swing::text::Caret * getCaret();
-  virtual void moveDot(jint, ::javax::swing::text::Position$Bias *);
-  virtual void setDot(jint, ::javax::swing::text::Position$Bias *);
-public: // actually package-private
-  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::javax::swing::text::NavigationFilter$FilterBypass)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret$Bypass__
diff --git a/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h b/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h
deleted file mode 100644
index 64b15b178d4..00000000000
--- a/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret$DocumentHandler__
-#define __javax_swing_text_DefaultCaret$DocumentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class DefaultCaret;
-          class DefaultCaret$DocumentHandler;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret$DocumentHandler : public ::java::lang::Object
-{
-
-  DefaultCaret$DocumentHandler(::javax::swing::text::DefaultCaret *);
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
-public: // actually package-private
-  DefaultCaret$DocumentHandler(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$DocumentHandler *);
-  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret$DocumentHandler__
diff --git a/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h b/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h
deleted file mode 100644
index 469a8858ed7..00000000000
--- a/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret$PropertyChangeHandler__
-#define __javax_swing_text_DefaultCaret$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultCaret;
-          class DefaultCaret$PropertyChangeHandler;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  DefaultCaret$PropertyChangeHandler(::javax::swing::text::DefaultCaret *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  DefaultCaret$PropertyChangeHandler(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$PropertyChangeHandler *);
-  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret$PropertyChangeHandler__
diff --git a/libjava/javax/swing/text/DefaultCaret.h b/libjava/javax/swing/text/DefaultCaret.h
deleted file mode 100644
index 882bda70ca2..00000000000
--- a/libjava/javax/swing/text/DefaultCaret.h
+++ /dev/null
@@ -1,161 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret__
-#define __javax_swing_text_DefaultCaret__
-
-#pragma interface
-
-#include <java/awt/Rectangle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class DocumentListener;
-          class EventListenerList;
-      }
-      namespace text
-      {
-          class DefaultCaret;
-          class DefaultCaret$BlinkTimerListener;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-          class NavigationFilter$FilterBypass;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret : public ::java::awt::Rectangle
-{
-
-public:
-  DefaultCaret();
-private:
-  ::javax::swing::text::NavigationFilter$FilterBypass * getBypass();
-public:
-  virtual void setUpdatePolicy(jint);
-  virtual jint getUpdatePolicy();
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-private:
-  void updateTimerStatus();
-public: // actually protected
-  virtual void moveCaret(::java::awt::event::MouseEvent *);
-  virtual void positionCaret(::java::awt::event::MouseEvent *);
-public:
-  virtual void deinstall(::javax::swing::text::JTextComponent *);
-  virtual void install(::javax::swing::text::JTextComponent *);
-  virtual void setMagicCaretPosition(::java::awt::Point *);
-  virtual ::java::awt::Point * getMagicCaretPosition();
-  virtual jint getMark();
-private:
-  void clearHighlight();
-  void handleHighlight();
-public:
-  virtual void setSelectionVisible(jboolean);
-  virtual jboolean isSelectionVisible();
-public: // actually protected
-  virtual void repaint();
-public:
-  virtual void paint(::java::awt::Graphics *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-  virtual ::javax::swing::text::JTextComponent * getComponent();
-public:
-  virtual jint getBlinkRate();
-  virtual void setBlinkRate(jint);
-  virtual jint getDot();
-  virtual void moveDot(jint);
-public: // actually package-private
-  virtual void moveDotImpl(jint);
-public:
-  virtual void setDot(jint);
-public: // actually package-private
-  virtual void setDotImpl(jint);
-  virtual void appear();
-public:
-  virtual jboolean isActive();
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-public: // actually protected
-  virtual ::javax::swing::text::Highlighter$HighlightPainter * getSelectionPainter();
-  virtual void damage(::java::awt::Rectangle *);
-  virtual void adjustVisibility(::java::awt::Rectangle *);
-private:
-  void initBlinkTimer();
-public: // actually package-private
-  static ::javax::swing::text::JTextComponent * componentWithSelection;
-private:
-  static const jlong serialVersionUID = 4325555698756477346LL;
-public:
-  static const jint ALWAYS_UPDATE = 2;
-  static const jint NEVER_UPDATE = 1;
-  static const jint UPDATE_WHEN_ON_EDT = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::Rectangle)))) policy;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-public: // actually package-private
-  ::javax::swing::event::DocumentListener * documentListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::text::JTextComponent * textComponent;
-private:
-  jboolean selectionVisible;
-  jint blinkRate;
-  jint dot;
-  jint mark;
-  ::java::awt::Point * magicCaretPosition;
-public: // actually package-private
-  jboolean visible;
-  jboolean active;
-private:
-  ::java::lang::Object * highlightEntry;
-  ::javax::swing::Timer * blinkTimer;
-  ::javax::swing::text::DefaultCaret$BlinkTimerListener * blinkListener;
-public: // actually package-private
-  ::javax::swing::text::NavigationFilter$FilterBypass * bypass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h
deleted file mode 100644
index 7161c7a53f0..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BackwardAction__
-#define __javax_swing_text_DefaultEditorKit$BackwardAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$BackwardAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BackwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$BackwardAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BackwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h
deleted file mode 100644
index dfeb6a8707b..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BeepAction__
-#define __javax_swing_text_DefaultEditorKit$BeepAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$BeepAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BeepAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$BeepAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BeepAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h
deleted file mode 100644
index c208fa266e2..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BeginAction__
-#define __javax_swing_text_DefaultEditorKit$BeginAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$BeginAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BeginAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$BeginAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BeginAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h
deleted file mode 100644
index 5e253e7dca4..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BeginLineAction__
-#define __javax_swing_text_DefaultEditorKit$BeginLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$BeginLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BeginLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$BeginLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BeginLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h
deleted file mode 100644
index 24494a80116..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BeginWordAction__
-#define __javax_swing_text_DefaultEditorKit$BeginWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$BeginWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BeginWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$BeginWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BeginWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h b/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h
deleted file mode 100644
index 30e8dc2f01d..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$CopyAction__
-#define __javax_swing_text_DefaultEditorKit$CopyAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$CopyAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$CopyAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$CopyAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$CopyAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$CutAction.h b/libjava/javax/swing/text/DefaultEditorKit$CutAction.h
deleted file mode 100644
index 603d1685726..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$CutAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$CutAction__
-#define __javax_swing_text_DefaultEditorKit$CutAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$CutAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$CutAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$CutAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$CutAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h b/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h
deleted file mode 100644
index a467b07c05b..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
-#define __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$DefaultKeyTypedAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$DefaultKeyTypedAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$DefaultKeyTypedAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h b/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h
deleted file mode 100644
index b623fa55fac..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
-#define __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$DeleteNextCharAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$DeleteNextCharAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$DeleteNextCharAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h b/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h
deleted file mode 100644
index 9e4f2bf6d18..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
-#define __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$DeletePrevCharAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$DeletePrevCharAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$DeletePrevCharAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DownAction.h b/libjava/javax/swing/text/DefaultEditorKit$DownAction.h
deleted file mode 100644
index facbd833be1..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$DownAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$DownAction__
-#define __javax_swing_text_DefaultEditorKit$DownAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$VerticalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$DownAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$DownAction : public ::javax::swing::text::TextAction$VerticalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$DownAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$DownAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndAction.h
deleted file mode 100644
index b2cedfe98f3..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$EndAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$EndAction__
-#define __javax_swing_text_DefaultEditorKit$EndAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$EndAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$EndAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$EndAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$EndAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h
deleted file mode 100644
index 907656700f0..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$EndLineAction__
-#define __javax_swing_text_DefaultEditorKit$EndLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$EndLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$EndLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$EndLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$EndLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h
deleted file mode 100644
index 252a77ab14a..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$EndWordAction__
-#define __javax_swing_text_DefaultEditorKit$EndWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$EndWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$EndWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$EndWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$EndWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h
deleted file mode 100644
index 3c3c7cfd18c..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$ForwardAction__
-#define __javax_swing_text_DefaultEditorKit$ForwardAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$ForwardAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$ForwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$ForwardAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$ForwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h
deleted file mode 100644
index 173b4b18d79..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$InsertBreakAction__
-#define __javax_swing_text_DefaultEditorKit$InsertBreakAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$InsertBreakAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$InsertBreakAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$InsertBreakAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$InsertBreakAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h
deleted file mode 100644
index 98d77fa17fd..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$InsertContentAction__
-#define __javax_swing_text_DefaultEditorKit$InsertContentAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$InsertContentAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$InsertContentAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$InsertContentAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$InsertContentAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h
deleted file mode 100644
index 6201db686f6..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$InsertTabAction__
-#define __javax_swing_text_DefaultEditorKit$InsertTabAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$InsertTabAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$InsertTabAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$InsertTabAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$InsertTabAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h
deleted file mode 100644
index eedad5f0dbf..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$NextWordAction__
-#define __javax_swing_text_DefaultEditorKit$NextWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$NextWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$NextWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$NextWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$NextWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h b/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h
deleted file mode 100644
index 2a0764c7a9f..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$PasteAction__
-#define __javax_swing_text_DefaultEditorKit$PasteAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$PasteAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$PasteAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$PasteAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$PasteAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h
deleted file mode 100644
index 6d7f529cd53..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$PreviousWordAction__
-#define __javax_swing_text_DefaultEditorKit$PreviousWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$PreviousWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$PreviousWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$PreviousWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$PreviousWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h
deleted file mode 100644
index 7286cd079ce..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectAllAction__
-#define __javax_swing_text_DefaultEditorKit$SelectAllAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectAllAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectAllAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectAllAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectAllAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h
deleted file mode 100644
index 390f7db2823..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectLineAction__
-#define __javax_swing_text_DefaultEditorKit$SelectLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h
deleted file mode 100644
index bc33182b611..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h
deleted file mode 100644
index 3417cebb222..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$SelectionBackwardAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionBackwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionBackwardAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h
deleted file mode 100644
index e0f68eb2e40..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionBeginAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionBeginAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionBeginAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h
deleted file mode 100644
index d8b57669c8e..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionBeginLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionBeginLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionBeginLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h
deleted file mode 100644
index fa85b345129..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionBeginWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionBeginWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionBeginWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h
deleted file mode 100644
index 5e005df8bfb..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionDownAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionDownAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$VerticalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$SelectionDownAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionDownAction : public ::javax::swing::text::TextAction$VerticalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionDownAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionDownAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h
deleted file mode 100644
index b1b03cdbb3d..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionEndAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionEndAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionEndAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionEndAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionEndAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h
deleted file mode 100644
index 2ff14cb78d7..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionEndLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionEndLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionEndLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h
deleted file mode 100644
index 5bb3b47c2fa..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionEndWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionEndWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionEndWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h
deleted file mode 100644
index 8447af6a3d7..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$SelectionForwardAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionForwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionForwardAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h
deleted file mode 100644
index 1647d7c4277..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionNextWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionNextWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionNextWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h
deleted file mode 100644
index 5257dafe636..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionPreviousWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionPreviousWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionPreviousWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h
deleted file mode 100644
index 9d5b3f41ca1..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionUpAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionUpAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$VerticalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$SelectionUpAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionUpAction : public ::javax::swing::text::TextAction$VerticalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionUpAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionUpAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$UpAction.h b/libjava/javax/swing/text/DefaultEditorKit$UpAction.h
deleted file mode 100644
index e2cc3eaa7e9..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$UpAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$UpAction__
-#define __javax_swing_text_DefaultEditorKit$UpAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$VerticalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$UpAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$UpAction : public ::javax::swing::text::TextAction$VerticalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$UpAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$UpAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit.h b/libjava/javax/swing/text/DefaultEditorKit.h
deleted file mode 100644
index 281960937e9..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit__
-#define __javax_swing_text_DefaultEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/EditorKit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit;
-          class Document;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit : public ::javax::swing::text::EditorKit
-{
-
-public:
-  DefaultEditorKit();
-  virtual ::javax::swing::text::Caret * createCaret();
-  virtual ::javax::swing::text::Document * createDefaultDocument();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual ::java::lang::String * getContentType();
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
-  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
-  virtual void write(::java::io::OutputStream *, ::javax::swing::text::Document *, jint, jint);
-  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
-private:
-  static const jlong serialVersionUID = 9017245433028523428LL;
-public:
-  static ::java::lang::String * backwardAction;
-  static ::java::lang::String * beepAction;
-  static ::java::lang::String * beginAction;
-  static ::java::lang::String * beginLineAction;
-  static ::java::lang::String * beginParagraphAction;
-  static ::java::lang::String * beginWordAction;
-  static ::java::lang::String * copyAction;
-  static ::java::lang::String * cutAction;
-  static ::java::lang::String * defaultKeyTypedAction;
-  static ::java::lang::String * deleteNextCharAction;
-  static ::java::lang::String * deletePrevCharAction;
-  static ::java::lang::String * downAction;
-  static ::java::lang::String * endAction;
-  static ::java::lang::String * endLineAction;
-  static ::java::lang::String * EndOfLineStringProperty;
-  static ::java::lang::String * endParagraphAction;
-  static ::java::lang::String * endWordAction;
-  static ::java::lang::String * forwardAction;
-  static ::java::lang::String * insertBreakAction;
-  static ::java::lang::String * insertContentAction;
-  static ::java::lang::String * insertTabAction;
-  static ::java::lang::String * nextWordAction;
-  static ::java::lang::String * pageDownAction;
-  static ::java::lang::String * pageUpAction;
-  static ::java::lang::String * pasteAction;
-  static ::java::lang::String * previousWordAction;
-  static ::java::lang::String * readOnlyAction;
-  static ::java::lang::String * selectAllAction;
-  static ::java::lang::String * selectionBackwardAction;
-  static ::java::lang::String * selectionBeginAction;
-  static ::java::lang::String * selectionBeginLineAction;
-  static ::java::lang::String * selectionBeginParagraphAction;
-  static ::java::lang::String * selectionBeginWordAction;
-  static ::java::lang::String * selectionDownAction;
-  static ::java::lang::String * selectionEndAction;
-  static ::java::lang::String * selectionEndLineAction;
-  static ::java::lang::String * selectionEndParagraphAction;
-  static ::java::lang::String * selectionEndWordAction;
-  static ::java::lang::String * selectionForwardAction;
-  static ::java::lang::String * selectionNextWordAction;
-  static ::java::lang::String * selectionPreviousWordAction;
-  static ::java::lang::String * selectionUpAction;
-  static ::java::lang::String * selectLineAction;
-  static ::java::lang::String * selectParagraphAction;
-  static ::java::lang::String * selectWordAction;
-  static ::java::lang::String * upAction;
-  static ::java::lang::String * writableAction;
-private:
-  static JArray< ::javax::swing::Action * > * defaultActions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit__
diff --git a/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h b/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h
deleted file mode 100644
index 090ade49349..00000000000
--- a/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
-#define __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
-
-#pragma interface
-
-#include <javax/swing/text/DocumentFilter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class DefaultFormatter;
-          class DefaultFormatter$FormatterDocumentFilter;
-          class DocumentFilter$FilterBypass;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultFormatter$FormatterDocumentFilter : public ::javax::swing::text::DocumentFilter
-{
-
-  DefaultFormatter$FormatterDocumentFilter(::javax::swing::text::DefaultFormatter *);
-public:
-  virtual void remove(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint);
-  virtual void insertString(::javax::swing::text::DocumentFilter$FilterBypass *, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-  virtual void replace(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-private:
-  void commitIfAllowed();
-  void checkValidInput();
-public: // actually package-private
-  DefaultFormatter$FormatterDocumentFilter(::javax::swing::text::DefaultFormatter *, ::javax::swing::text::DefaultFormatter$FormatterDocumentFilter *);
-  ::javax::swing::text::DefaultFormatter * __attribute__((aligned(__alignof__( ::javax::swing::text::DocumentFilter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
diff --git a/libjava/javax/swing/text/DefaultFormatter.h b/libjava/javax/swing/text/DefaultFormatter.h
deleted file mode 100644
index 858a1efcac8..00000000000
--- a/libjava/javax/swing/text/DefaultFormatter.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultFormatter__
-#define __javax_swing_text_DefaultFormatter__
-
-#pragma interface
-
-#include <javax/swing/JFormattedTextField$AbstractFormatter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-      namespace text
-      {
-          class DefaultFormatter;
-          class DocumentFilter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultFormatter : public ::javax::swing::JFormattedTextField$AbstractFormatter
-{
-
-public:
-  DefaultFormatter();
-  virtual void install(::javax::swing::JFormattedTextField *);
-  virtual jboolean getCommitsOnValidEdit();
-  virtual void setCommitsOnValidEdit(jboolean);
-  virtual jboolean getOverwriteMode();
-  virtual void setOverwriteMode(jboolean);
-  virtual jboolean getAllowsInvalid();
-  virtual void setAllowsInvalid(jboolean);
-  virtual ::java::lang::Class * getValueClass();
-  virtual void setValueClass(::java::lang::Class *);
-  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
-  virtual ::java::lang::String * valueToString(::java::lang::Object *);
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
-public: // actually package-private
-  static ::javax::swing::JFormattedTextField * access$0(::javax::swing::text::DefaultFormatter *);
-private:
-  static const jlong serialVersionUID = -355018354457785329LL;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JFormattedTextField$AbstractFormatter)))) commitsOnValidEdit;
-  jboolean overwriteMode;
-  jboolean allowsInvalid;
-  ::java::lang::Class * valueClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultFormatter__
diff --git a/libjava/javax/swing/text/DefaultFormatterFactory.h b/libjava/javax/swing/text/DefaultFormatterFactory.h
deleted file mode 100644
index 8e39926a666..00000000000
--- a/libjava/javax/swing/text/DefaultFormatterFactory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultFormatterFactory__
-#define __javax_swing_text_DefaultFormatterFactory__
-
-#pragma interface
-
-#include <javax/swing/JFormattedTextField$AbstractFormatterFactory.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-        class JFormattedTextField$AbstractFormatter;
-      namespace text
-      {
-          class DefaultFormatterFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultFormatterFactory : public ::javax::swing::JFormattedTextField$AbstractFormatterFactory
-{
-
-public:
-  DefaultFormatterFactory();
-  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
-  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
-  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getDefaultFormatter();
-  virtual void setDefaultFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getDisplayFormatter();
-  virtual void setDisplayFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getEditFormatter();
-  virtual void setEditFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getNullFormatter();
-  virtual void setNullFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter(::javax::swing::JFormattedTextField *);
-public: // actually package-private
-  ::javax::swing::JFormattedTextField$AbstractFormatter * __attribute__((aligned(__alignof__( ::javax::swing::JFormattedTextField$AbstractFormatterFactory)))) defaultFormatter;
-  ::javax::swing::JFormattedTextField$AbstractFormatter * editFormatter;
-  ::javax::swing::JFormattedTextField$AbstractFormatter * displayFormatter;
-  ::javax::swing::JFormattedTextField$AbstractFormatter * nullFormatter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultFormatterFactory__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h b/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h
deleted file mode 100644
index 0baecc9c081..00000000000
--- a/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
-#define __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
-
-#pragma interface
-
-#include <javax/swing/text/LayeredHighlighter$LayerPainter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultHighlighter$DefaultHighlightPainter;
-          class JTextComponent;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultHighlighter$DefaultHighlightPainter : public ::javax::swing::text::LayeredHighlighter$LayerPainter
-{
-
-public:
-  DefaultHighlighter$DefaultHighlightPainter(::java::awt::Color *);
-  virtual ::java::awt::Color * getColor();
-  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *);
-  virtual ::java::awt::Shape * paintLayer(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
-private:
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::LayeredHighlighter$LayerPainter)))) color;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h b/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h
deleted file mode 100644
index 439d60491b2..00000000000
--- a/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultHighlighter$HighlightEntry__
-#define __javax_swing_text_DefaultHighlighter$HighlightEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultHighlighter;
-          class DefaultHighlighter$HighlightEntry;
-          class Highlighter$HighlightPainter;
-          class Position;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultHighlighter$HighlightEntry : public ::java::lang::Object
-{
-
-public:
-  DefaultHighlighter$HighlightEntry(::javax::swing::text::DefaultHighlighter *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, ::javax::swing::text::Highlighter$HighlightPainter *);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::javax::swing::text::Highlighter$HighlightPainter * getPainter();
-public: // actually package-private
-  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p0;
-  ::javax::swing::text::Position * p1;
-  ::javax::swing::text::Highlighter$HighlightPainter * painter;
-  ::javax::swing::text::DefaultHighlighter * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultHighlighter$HighlightEntry__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h b/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h
deleted file mode 100644
index 15220e242ab..00000000000
--- a/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
-#define __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultHighlighter$HighlightEntry.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultHighlighter;
-          class DefaultHighlighter$LayerHighlightEntry;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-          class Position;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultHighlighter$LayerHighlightEntry : public ::javax::swing::text::DefaultHighlighter$HighlightEntry
-{
-
-public: // actually package-private
-  DefaultHighlighter$LayerHighlightEntry(::javax::swing::text::DefaultHighlighter *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, ::javax::swing::text::Highlighter$HighlightPainter *);
-  virtual void paintLayeredHighlight(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultHighlighter$HighlightEntry)))) paintRect;
-  ::javax::swing::text::DefaultHighlighter * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
diff --git a/libjava/javax/swing/text/DefaultHighlighter.h b/libjava/javax/swing/text/DefaultHighlighter.h
deleted file mode 100644
index a237a131280..00000000000
--- a/libjava/javax/swing/text/DefaultHighlighter.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultHighlighter__
-#define __javax_swing_text_DefaultHighlighter__
-
-#pragma interface
-
-#include <javax/swing/text/LayeredHighlighter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultHighlighter;
-          class Highlighter$Highlight;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-          class LayeredHighlighter$LayerPainter;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultHighlighter : public ::javax::swing::text::LayeredHighlighter
-{
-
-public:
-  DefaultHighlighter();
-  virtual jboolean getDrawsLayeredHighlights();
-  virtual void setDrawsLayeredHighlights(jboolean);
-private:
-  void checkPositions(jint, jint);
-public:
-  virtual void install(::javax::swing::text::JTextComponent *);
-  virtual void deinstall(::javax::swing::text::JTextComponent *);
-  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *);
-  virtual void removeHighlight(::java::lang::Object *);
-  virtual void removeAllHighlights();
-  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights();
-  virtual void changeHighlight(::java::lang::Object *, jint, jint);
-  virtual void paintLayeredHighlights(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
-  virtual void paint(::java::awt::Graphics *);
-  static ::javax::swing::text::LayeredHighlighter$LayerPainter * DefaultPainter;
-private:
-  ::javax::swing::text::JTextComponent * __attribute__((aligned(__alignof__( ::javax::swing::text::LayeredHighlighter)))) textComponent;
-  ::java::util::ArrayList * highlights;
-  jboolean drawsLayeredHighlights;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultHighlighter__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h b/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h
deleted file mode 100644
index ebaf8caa869..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
-#define __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class DefaultStyledDocument$AttributeUndoableEdit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$AttributeUndoableEdit : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  DefaultStyledDocument$AttributeUndoableEdit(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jboolean);
-  virtual void undo();
-  virtual void redo();
-public: // actually protected
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) copy;
-  ::javax::swing::text::AttributeSet * newAttributes;
-  jboolean isReplacing;
-  ::javax::swing::text::Element * element;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h
deleted file mode 100644
index 628569976a2..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
-#define __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultStyledDocument$ElementBuffer;
-          class DefaultStyledDocument$ElementBuffer$Edit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultStyledDocument$ElementBuffer$Edit(::javax::swing::text::DefaultStyledDocument$ElementBuffer *, ::javax::swing::text::Element *, jint);
-  DefaultStyledDocument$ElementBuffer$Edit(::javax::swing::text::DefaultStyledDocument$ElementBuffer *, ::javax::swing::text::Element *, jint, jboolean);
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) e;
-  jint index;
-  ::java::util::ArrayList * removed;
-  ::java::util::ArrayList * added;
-  jboolean isFracture;
-  ::javax::swing::text::DefaultStyledDocument$ElementBuffer * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h
deleted file mode 100644
index 17151db0e8b..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$ElementBuffer__
-#define __javax_swing_text_DefaultStyledDocument$ElementBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$DefaultDocumentEvent;
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$ElementBuffer;
-          class DefaultStyledDocument$ElementBuffer$Edit;
-          class DefaultStyledDocument$ElementSpec;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$ElementBuffer : public ::java::lang::Object
-{
-
-public:
-  DefaultStyledDocument$ElementBuffer(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::Element *);
-  virtual ::javax::swing::text::Element * getRootElement();
-  virtual void remove(jint, jint, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public: // actually protected
-  virtual void removeUpdate();
-private:
-  jboolean removeElements(::javax::swing::text::Element *, jint, jint);
-public: // actually package-private
-  virtual void create(jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-private:
-  jboolean canJoin(::javax::swing::text::Element *, ::javax::swing::text::Element *);
-  ::javax::swing::text::Element * join(::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::Element *, jint, jint);
-public: // actually protected
-  virtual void changeUpdate();
-public:
-  virtual void change(jint, jint, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-  virtual ::javax::swing::text::Element * clone(::javax::swing::text::Element *, ::javax::swing::text::Element *);
-private:
-  ::javax::swing::text::Element * cloneAsNecessary(::javax::swing::text::Element *, ::javax::swing::text::Element *, jint, jint);
-public:
-  virtual void insert(jint, jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-private:
-  void prepareEdit(jint, jint);
-  void finishEdit(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public: // actually protected
-  virtual void insertUpdate(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-private:
-  void pop();
-  void insertElement(::javax::swing::text::DefaultStyledDocument$ElementSpec *);
-  void insertFirstContentTag(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  void insertContentTag(::javax::swing::text::DefaultStyledDocument$ElementSpec *, ::javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit *);
-  void createFracture(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  void fracture(jint);
-  void recreate(jint, jint);
-  ::javax::swing::text::Element * recreateFracturedElement(::javax::swing::text::Element *, ::javax::swing::text::Element *);
-  jboolean split(jint, jint);
-  static const jlong serialVersionUID = 1688745877691146623LL;
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
-  jint offset;
-  jint endOffset;
-  jint length;
-  jint pos;
-  ::javax::swing::text::Element * fracturedParent;
-  ::javax::swing::text::Element * fracturedChild;
-  jboolean createdFracture;
-  ::java::util::Stack * elementStack;
-  JArray< ::javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit * > * insertPath;
-  jboolean recreateLeafs;
-  ::java::util::ArrayList * edits;
-  jboolean offsetLastIndex;
-  jboolean offsetLastIndexReplace;
-public: // actually package-private
-  ::javax::swing::text::DefaultStyledDocument * this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$ElementBuffer__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h
deleted file mode 100644
index 7c2433411b6..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$ElementSpec__
-#define __javax_swing_text_DefaultStyledDocument$ElementSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class DefaultStyledDocument$ElementSpec;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$ElementSpec : public ::java::lang::Object
-{
-
-public:
-  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort);
-  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort, jint);
-  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort, JArray< jchar > *, jint, jint);
-  virtual void setType(jshort);
-  virtual jshort getType();
-  virtual void setDirection(jshort);
-  virtual jshort getDirection();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual JArray< jchar > * getArray();
-  virtual jint getOffset();
-  virtual jint getLength();
-  virtual ::java::lang::String * toString();
-  static const jshort StartTagType = 1;
-  static const jshort EndTagType = 2;
-  static const jshort ContentType = 3;
-  static const jshort JoinPreviousDirection = 4;
-  static const jshort JoinNextDirection = 5;
-  static const jshort OriginateDirection = 6;
-  static const jshort JoinFractureDirection = 7;
-public: // actually package-private
-  jshort __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jshort direction;
-  jint offset;
-  jint length;
-  JArray< jchar > * content;
-  ::javax::swing::text::AttributeSet * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$ElementSpec__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h b/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h
deleted file mode 100644
index 969238dc39d..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$SectionElement__
-#define __javax_swing_text_DefaultStyledDocument$SectionElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$BranchElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$SectionElement;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$SectionElement : public ::javax::swing::text::AbstractDocument$BranchElement
-{
-
-public:
-  DefaultStyledDocument$SectionElement(::javax::swing::text::DefaultStyledDocument *);
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  ::javax::swing::text::DefaultStyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$SectionElement__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h b/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h
deleted file mode 100644
index e3095acf5b6..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
-#define __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace text
-      {
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$StyleChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$StyleChangeListener : public ::java::lang::Object
-{
-
-  DefaultStyledDocument$StyleChangeListener(::javax::swing::text::DefaultStyledDocument *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  DefaultStyledDocument$StyleChangeListener(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::DefaultStyledDocument$StyleChangeListener *);
-  ::javax::swing::text::DefaultStyledDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument.h b/libjava/javax/swing/text/DefaultStyledDocument.h
deleted file mode 100644
index 8db689f6926..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument__
-#define __javax_swing_text_DefaultStyledDocument__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$AbstractElement;
-          class AbstractDocument$Content;
-          class AbstractDocument$DefaultDocumentEvent;
-          class AttributeSet;
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$ElementBuffer;
-          class DefaultStyledDocument$ElementSpec;
-          class DefaultStyledDocument$StyleChangeListener;
-          class Element;
-          class Style;
-          class StyleContext;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument : public ::javax::swing::text::AbstractDocument
-{
-
-public:
-  DefaultStyledDocument();
-  DefaultStyledDocument(::javax::swing::text::StyleContext *);
-  DefaultStyledDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::StyleContext *);
-  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
-public:
-  virtual ::javax::swing::text::Element * getCharacterElement(jint);
-  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::Element * getDefaultRootElement();
-  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
-  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::Style * getLogicalStyle(jint);
-  virtual ::javax::swing::text::Element * getParagraphElement(jint);
-  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
-  virtual void removeStyle(::java::lang::String *);
-  virtual void setCharacterAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean);
-  virtual void setLogicalStyle(jint, ::javax::swing::text::Style *);
-  virtual void setParagraphAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean);
-public: // actually protected
-  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
-private:
-  jshort insertAfterNewline(::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, ::java::util::ArrayList *, jint, jint);
-public: // actually package-private
-  virtual jshort handleInsertAfterNewline(::java::util::Vector *, jint, jint, ::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-public: // actually protected
-  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public:
-  virtual ::java::util::Enumeration * getStyleNames();
-public: // actually protected
-  virtual void styleChanged(::javax::swing::text::Style *);
-  virtual void insert(jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  virtual void create(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-private:
-  static const jlong serialVersionUID = 940485415728614849LL;
-public:
-  static const jint BUFFER_SIZE_DEFAULT = 4096;
-public: // actually protected
-  ::javax::swing::text::DefaultStyledDocument$ElementBuffer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument)))) buffer;
-private:
-  ::javax::swing::text::DefaultStyledDocument$StyleChangeListener * styleChangeListener;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument__
diff --git a/libjava/javax/swing/text/DefaultTextUI.h b/libjava/javax/swing/text/DefaultTextUI.h
deleted file mode 100644
index 5c211d3040f..00000000000
--- a/libjava/javax/swing/text/DefaultTextUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultTextUI__
-#define __javax_swing_text_DefaultTextUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultTextUI;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultTextUI : public ::javax::swing::plaf::basic::BasicTextUI
-{
-
-public:
-  DefaultTextUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultTextUI__
diff --git a/libjava/javax/swing/text/Document.h b/libjava/javax/swing/text/Document.h
deleted file mode 100644
index d68e3e77d89..00000000000
--- a/libjava/javax/swing/text/Document.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Document__
-#define __javax_swing_text_Document__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentListener;
-          class UndoableEditListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class Element;
-          class Position;
-          class Segment;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Document : public ::java::lang::Object
-{
-
-public:
-  virtual void addDocumentListener(::javax::swing::event::DocumentListener *) = 0;
-  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
-  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
-  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
-  virtual ::javax::swing::text::Position * getEndPosition() = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::Object *) = 0;
-  virtual JArray< ::javax::swing::text::Element * > * getRootElements() = 0;
-  virtual ::javax::swing::text::Position * getStartPosition() = 0;
-  virtual ::java::lang::String * getText(jint, jint) = 0;
-  virtual void getText(jint, jint, ::javax::swing::text::Segment *) = 0;
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void remove(jint, jint) = 0;
-  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *) = 0;
-  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
-  virtual void render(::java::lang::Runnable *) = 0;
-  static ::java::lang::String * StreamDescriptionProperty;
-  static ::java::lang::String * TitleProperty;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Document__
diff --git a/libjava/javax/swing/text/DocumentFilter$FilterBypass.h b/libjava/javax/swing/text/DocumentFilter$FilterBypass.h
deleted file mode 100644
index 4b5c3589d33..00000000000
--- a/libjava/javax/swing/text/DocumentFilter$FilterBypass.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DocumentFilter$FilterBypass__
-#define __javax_swing_text_DocumentFilter$FilterBypass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class DocumentFilter$FilterBypass;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DocumentFilter$FilterBypass : public ::java::lang::Object
-{
-
-public:
-  DocumentFilter$FilterBypass();
-  virtual ::javax::swing::text::Document * getDocument() = 0;
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual void remove(jint, jint) = 0;
-  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DocumentFilter$FilterBypass__
diff --git a/libjava/javax/swing/text/DocumentFilter.h b/libjava/javax/swing/text/DocumentFilter.h
deleted file mode 100644
index 106478aff12..00000000000
--- a/libjava/javax/swing/text/DocumentFilter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DocumentFilter__
-#define __javax_swing_text_DocumentFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class DocumentFilter;
-          class DocumentFilter$FilterBypass;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DocumentFilter : public ::java::lang::Object
-{
-
-public:
-  DocumentFilter();
-  virtual void insertString(::javax::swing::text::DocumentFilter$FilterBypass *, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-  virtual void remove(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint);
-  virtual void replace(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DocumentFilter__
diff --git a/libjava/javax/swing/text/EditorKit.h b/libjava/javax/swing/text/EditorKit.h
deleted file mode 100644
index eaeef504294..00000000000
--- a/libjava/javax/swing/text/EditorKit.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_EditorKit__
-#define __javax_swing_text_EditorKit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JEditorPane;
-      namespace text
-      {
-          class Caret;
-          class Document;
-          class EditorKit;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::EditorKit : public ::java::lang::Object
-{
-
-public:
-  EditorKit();
-  virtual ::java::lang::Object * clone();
-  virtual void deinstall(::javax::swing::JEditorPane *);
-  virtual void install(::javax::swing::JEditorPane *);
-  virtual ::javax::swing::text::Caret * createCaret() = 0;
-  virtual ::javax::swing::text::Document * createDefaultDocument() = 0;
-  virtual JArray< ::javax::swing::Action * > * getActions() = 0;
-  virtual ::java::lang::String * getContentType() = 0;
-  virtual ::javax::swing::text::ViewFactory * getViewFactory() = 0;
-  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint) = 0;
-  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint) = 0;
-  virtual void write(::java::io::OutputStream *, ::javax::swing::text::Document *, jint, jint) = 0;
-  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint) = 0;
-private:
-  static const jlong serialVersionUID = -5044124649345887822LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_EditorKit__
diff --git a/libjava/javax/swing/text/Element.h b/libjava/javax/swing/text/Element.h
deleted file mode 100644
index 6166044c0ec..00000000000
--- a/libjava/javax/swing/text/Element.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Element__
-#define __javax_swing_text_Element__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Element : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::AttributeSet * getAttributes() = 0;
-  virtual ::javax::swing::text::Document * getDocument() = 0;
-  virtual ::javax::swing::text::Element * getElement(jint) = 0;
-  virtual jint getElementCount() = 0;
-  virtual jint getElementIndex(jint) = 0;
-  virtual jint getEndOffset() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::swing::text::Element * getParentElement() = 0;
-  virtual jint getStartOffset() = 0;
-  virtual jboolean isLeaf() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Element__
diff --git a/libjava/javax/swing/text/ElementIterator$ElementRef.h b/libjava/javax/swing/text/ElementIterator$ElementRef.h
deleted file mode 100644
index dd2c984c44d..00000000000
--- a/libjava/javax/swing/text/ElementIterator$ElementRef.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ElementIterator$ElementRef__
-#define __javax_swing_text_ElementIterator$ElementRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class ElementIterator;
-          class ElementIterator$ElementRef;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ElementIterator$ElementRef : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ElementIterator$ElementRef(::javax::swing::text::ElementIterator *, ::javax::swing::text::Element *);
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) element;
-  jint index;
-  ::javax::swing::text::ElementIterator * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ElementIterator$ElementRef__
diff --git a/libjava/javax/swing/text/ElementIterator.h b/libjava/javax/swing/text/ElementIterator.h
deleted file mode 100644
index 1d963602109..00000000000
--- a/libjava/javax/swing/text/ElementIterator.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ElementIterator__
-#define __javax_swing_text_ElementIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Document;
-          class Element;
-          class ElementIterator;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ElementIterator : public ::java::lang::Object
-{
-
-public:
-  ElementIterator(::javax::swing::text::Document *);
-  ElementIterator(::javax::swing::text::Element *);
-  virtual ::java::lang::Object * clone();
-  virtual ::javax::swing::text::Element * current();
-  virtual jint depth();
-  virtual ::javax::swing::text::Element * first();
-  virtual ::javax::swing::text::Element * next();
-  virtual ::javax::swing::text::Element * previous();
-private:
-  ::javax::swing::text::Element * deepestLeaf(::javax::swing::text::Element *);
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
-  ::java::util::Stack * stack;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ElementIterator__
diff --git a/libjava/javax/swing/text/EmptyAttributeSet$1.h b/libjava/javax/swing/text/EmptyAttributeSet$1.h
deleted file mode 100644
index 4d63472d673..00000000000
--- a/libjava/javax/swing/text/EmptyAttributeSet$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_EmptyAttributeSet$1__
-#define __javax_swing_text_EmptyAttributeSet$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class EmptyAttributeSet;
-          class EmptyAttributeSet$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::EmptyAttributeSet$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EmptyAttributeSet$1(::javax::swing::text::EmptyAttributeSet *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::javax::swing::text::EmptyAttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_EmptyAttributeSet$1__
diff --git a/libjava/javax/swing/text/EmptyAttributeSet.h b/libjava/javax/swing/text/EmptyAttributeSet.h
deleted file mode 100644
index e0f19294400..00000000000
--- a/libjava/javax/swing/text/EmptyAttributeSet.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_EmptyAttributeSet__
-#define __javax_swing_text_EmptyAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class EmptyAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::EmptyAttributeSet : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EmptyAttributeSet();
-public:
-  jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  ::javax::swing::text::AttributeSet * copyAttributes();
-  ::java::lang::Object * getAttribute(::java::lang::Object *);
-  jint getAttributeCount();
-  ::java::util::Enumeration * getAttributeNames();
-  ::javax::swing::text::AttributeSet * getResolveParent();
-  jboolean isDefined(::java::lang::Object *);
-  jboolean isEqual(::javax::swing::text::AttributeSet *);
-  jboolean equals(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_EmptyAttributeSet__
diff --git a/libjava/javax/swing/text/FieldView$1.h b/libjava/javax/swing/text/FieldView$1.h
deleted file mode 100644
index 2979db8aedb..00000000000
--- a/libjava/javax/swing/text/FieldView$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FieldView$1__
-#define __javax_swing_text_FieldView$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace text
-      {
-          class FieldView;
-          class FieldView$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FieldView$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FieldView$1(::javax::swing::text::FieldView *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::text::FieldView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FieldView$1__
diff --git a/libjava/javax/swing/text/FieldView.h b/libjava/javax/swing/text/FieldView.h
deleted file mode 100644
index 54cf4fb8272..00000000000
--- a/libjava/javax/swing/text/FieldView.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FieldView__
-#define __javax_swing_text_FieldView__
-
-#pragma interface
-
-#include <javax/swing/text/PlainView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class FontMetrics;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class BoundedRangeModel;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class FieldView;
-          class Position$Bias;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FieldView : public ::javax::swing::text::PlainView
-{
-
-public:
-  FieldView(::javax::swing::text::Element *);
-private:
-  void checkContainer();
-  void updateVisibility();
-public: // actually protected
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::Shape * adjustAllocation(::java::awt::Shape *);
-public:
-  virtual jfloat getPreferredSpan(jint);
-private:
-  jfloat calculateHorizontalSpan();
-public:
-  virtual jint getResizeWeight(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually package-private
-  ::javax::swing::BoundedRangeModel * __attribute__((aligned(__alignof__( ::javax::swing::text::PlainView)))) horizontalVisibility;
-  jfloat cachedSpan;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FieldView__
diff --git a/libjava/javax/swing/text/FlowView$FlowStrategy.h b/libjava/javax/swing/text/FlowView$FlowStrategy.h
deleted file mode 100644
index c9d567d2f1b..00000000000
--- a/libjava/javax/swing/text/FlowView$FlowStrategy.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FlowView$FlowStrategy__
-#define __javax_swing_text_FlowView$FlowStrategy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class FlowView;
-          class FlowView$FlowStrategy;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FlowView$FlowStrategy : public ::java::lang::Object
-{
-
-public:
-  FlowView$FlowStrategy();
-  virtual void insertUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
-  virtual void removeUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
-  virtual void changedUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
-public: // actually protected
-  virtual ::javax::swing::text::View * getLogicalView(::javax::swing::text::FlowView *);
-public:
-  virtual void layout(::javax::swing::text::FlowView *);
-public: // actually protected
-  virtual jint layoutRow(::javax::swing::text::FlowView *, jint, jint);
-  virtual ::javax::swing::text::View * createView(::javax::swing::text::FlowView *, jint, jint, jint);
-  virtual void adjustRow(::javax::swing::text::FlowView *, jint, jint, jint);
-private:
-  jboolean contains(::javax::swing::text::View *, ::javax::swing::text::View *);
-  void reparent(::javax::swing::text::View *, ::javax::swing::text::View *);
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FlowView$FlowStrategy__
diff --git a/libjava/javax/swing/text/FlowView$LogicalView.h b/libjava/javax/swing/text/FlowView$LogicalView.h
deleted file mode 100644
index 271b4ef4a8e..00000000000
--- a/libjava/javax/swing/text/FlowView$LogicalView.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FlowView$LogicalView__
-#define __javax_swing_text_FlowView$LogicalView__
-
-#pragma interface
-
-#include <javax/swing/text/CompositeView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class FlowView;
-          class FlowView$LogicalView;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FlowView$LogicalView : public ::javax::swing::text::CompositeView
-{
-
-public: // actually package-private
-  FlowView$LogicalView(::javax::swing::text::FlowView *, ::javax::swing::text::Element *);
-public:
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-public: // actually protected
-  virtual void childAllocation(jint, ::java::awt::Rectangle *);
-  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *);
-  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *);
-  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *);
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual void forwardUpdateToView(::javax::swing::text::View *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jint getViewIndexAtPosition(jint);
-public: // actually package-private
-  ::javax::swing::text::FlowView * __attribute__((aligned(__alignof__( ::javax::swing::text::CompositeView)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FlowView$LogicalView__
diff --git a/libjava/javax/swing/text/FlowView.h b/libjava/javax/swing/text/FlowView.h
deleted file mode 100644
index 76535791569..00000000000
--- a/libjava/javax/swing/text/FlowView.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FlowView__
-#define __javax_swing_text_FlowView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class FlowView;
-          class FlowView$FlowStrategy;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FlowView : public ::javax::swing::text::BoxView
-{
-
-public:
-  FlowView(::javax::swing::text::Element *, jint);
-  virtual jint getFlowAxis();
-  virtual jint getFlowSpan(jint);
-  virtual jint getFlowStart(jint);
-public: // actually protected
-  virtual ::javax::swing::text::View * createRow() = 0;
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual void layout(jint, jint);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual jint getViewIndexAtPosition(jint);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-public: // actually package-private
-  static ::javax::swing::text::FlowView$FlowStrategy * sharedStrategy;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) layoutSpan;
-  ::javax::swing::text::View * layoutPool;
-  ::javax::swing::text::FlowView$FlowStrategy * strategy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FlowView__
diff --git a/libjava/javax/swing/text/GapContent$GapContentPosition.h b/libjava/javax/swing/text/GapContent$GapContentPosition.h
deleted file mode 100644
index a1d7afa6667..00000000000
--- a/libjava/javax/swing/text/GapContent$GapContentPosition.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$GapContentPosition__
-#define __javax_swing_text_GapContent$GapContentPosition__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$GapContentPosition;
-          class GapContent$Mark;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$GapContentPosition : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GapContent$GapContentPosition(::javax::swing::text::GapContent *);
-public:
-  virtual jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::GapContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$GapContentPosition__
diff --git a/libjava/javax/swing/text/GapContent$InsertUndo.h b/libjava/javax/swing/text/GapContent$InsertUndo.h
deleted file mode 100644
index f36085d3cb8..00000000000
--- a/libjava/javax/swing/text/GapContent$InsertUndo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$InsertUndo__
-#define __javax_swing_text_GapContent$InsertUndo__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$InsertUndo;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$InsertUndo : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  GapContent$InsertUndo(::javax::swing::text::GapContent *, jint, jint);
-  virtual void undo();
-  virtual void redo();
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) where;
-  jint length;
-public: // actually package-private
-  ::java::lang::String * text;
-private:
-  ::java::util::Vector * positions;
-public: // actually package-private
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$InsertUndo__
diff --git a/libjava/javax/swing/text/GapContent$Mark.h b/libjava/javax/swing/text/GapContent$Mark.h
deleted file mode 100644
index 35671023314..00000000000
--- a/libjava/javax/swing/text/GapContent$Mark.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$Mark__
-#define __javax_swing_text_GapContent$Mark__
-
-#pragma interface
-
-#include <java/lang/ref/WeakReference.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$GapContentPosition;
-          class GapContent$Mark;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$Mark : public ::java::lang::ref::WeakReference
-{
-
-public: // actually package-private
-  GapContent$Mark(::javax::swing::text::GapContent *, jint);
-  GapContent$Mark(::javax::swing::text::GapContent *, jint, ::javax::swing::text::GapContent$GapContentPosition *, ::java::lang::ref::ReferenceQueue *);
-  virtual jint getOffset();
-  virtual ::javax::swing::text::GapContent$GapContentPosition * getPosition();
-  jint __attribute__((aligned(__alignof__( ::java::lang::ref::WeakReference)))) mark;
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$Mark__
diff --git a/libjava/javax/swing/text/GapContent$UndoPosRef.h b/libjava/javax/swing/text/GapContent$UndoPosRef.h
deleted file mode 100644
index bd0629ac8ca..00000000000
--- a/libjava/javax/swing/text/GapContent$UndoPosRef.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$UndoPosRef__
-#define __javax_swing_text_GapContent$UndoPosRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$Mark;
-          class GapContent$UndoPosRef;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$UndoPosRef : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GapContent$UndoPosRef(::javax::swing::text::GapContent *, ::javax::swing::text::GapContent$Mark *);
-  virtual void reset();
-private:
-  ::javax::swing::text::GapContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  jint undoOffset;
-public: // actually package-private
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$UndoPosRef__
diff --git a/libjava/javax/swing/text/GapContent$UndoRemove.h b/libjava/javax/swing/text/GapContent$UndoRemove.h
deleted file mode 100644
index f5f8d6ae423..00000000000
--- a/libjava/javax/swing/text/GapContent$UndoRemove.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$UndoRemove__
-#define __javax_swing_text_GapContent$UndoRemove__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$UndoRemove;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$UndoRemove : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  GapContent$UndoRemove(::javax::swing::text::GapContent *, jint, ::java::lang::String *);
-  virtual void undo();
-  virtual void redo();
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) where;
-public: // actually package-private
-  ::java::lang::String * text;
-private:
-  ::java::util::Vector * positions;
-public: // actually package-private
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$UndoRemove__
diff --git a/libjava/javax/swing/text/GapContent.h b/libjava/javax/swing/text/GapContent.h
deleted file mode 100644
index 44a26ef5385..00000000000
--- a/libjava/javax/swing/text/GapContent.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent__
-#define __javax_swing_text_GapContent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$Mark;
-          class Position;
-          class Segment;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent : public ::java::lang::Object
-{
-
-public:
-  GapContent();
-  GapContent(jint);
-public: // actually protected
-  virtual ::java::lang::Object * allocateArray(jint);
-  virtual jint getArrayLength();
-public:
-  virtual jint length();
-  virtual ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *);
-  virtual ::javax::swing::undo::UndoableEdit * remove(jint, jint);
-  virtual ::java::lang::String * getString(jint, jint);
-  virtual void getChars(jint, jint, ::javax::swing::text::Segment *);
-  virtual ::javax::swing::text::Position * createPosition(jint);
-public: // actually protected
-  virtual void shiftEnd(jint);
-  virtual void shiftGap(jint);
-  virtual void shiftGapStartDown(jint);
-  virtual void shiftGapEndUp(jint);
-  virtual ::java::lang::Object * getArray();
-  virtual void replace(jint, jint, ::java::lang::Object *, jint);
-private:
-  void removeImpl(jint, jint);
-  jint addImpl(jint, jint);
-public: // actually protected
-  virtual jint getGapStart();
-  virtual jint getGapEnd();
-  virtual ::java::util::Vector * getPositionsInRange(::java::util::Vector *, jint, jint);
-  virtual void resetMarksAtZero();
-  virtual void updateUndoPositions(::java::util::Vector *, jint, jint);
-private:
-  void dump();
-  void dumpMarks();
-public: // actually package-private
-  virtual jint search(::javax::swing::text::GapContent$Mark *);
-private:
-  jint searchFirst(jint);
-  jint compare(::javax::swing::text::GapContent$Mark *, ::javax::swing::text::GapContent$Mark *);
-  void garbageCollect();
-  static const jlong serialVersionUID = -6226052713477823730LL;
-public: // actually package-private
-  static const jint DEFAULT_BUFSIZE = 10;
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  jint gapStart;
-  jint gapEnd;
-  ::java::util::ArrayList * marks;
-private:
-  jint garbageMarks;
-  ::javax::swing::text::GapContent$Mark * searchMark;
-public: // actually package-private
-  ::java::lang::ref::ReferenceQueue * queueOfDeath;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent__
diff --git a/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h b/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h
deleted file mode 100644
index 7a9c8a6b708..00000000000
--- a/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GlyphView$DefaultGlyphPainter__
-#define __javax_swing_text_GlyphView$DefaultGlyphPainter__
-
-#pragma interface
-
-#include <javax/swing/text/GlyphView$GlyphPainter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class FontMetrics;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GlyphView;
-          class GlyphView$DefaultGlyphPainter;
-          class Position$Bias;
-          class TabExpander;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GlyphView$DefaultGlyphPainter : public ::javax::swing::text::GlyphView$GlyphPainter
-{
-
-public: // actually package-private
-  GlyphView$DefaultGlyphPainter();
-public:
-  virtual jfloat getHeight(::javax::swing::text::GlyphView *);
-  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint);
-  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
-  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat);
-  virtual jfloat getAscent(::javax::swing::text::GlyphView *);
-  virtual jfloat getDescent(::javax::swing::text::GlyphView *);
-  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat);
-  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-private:
-  void updateFontMetrics(::javax::swing::text::GlyphView *);
-public: // actually package-private
-  ::java::awt::FontMetrics * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView$GlyphPainter)))) fontMetrics;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GlyphView$DefaultGlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView$GlyphPainter.h b/libjava/javax/swing/text/GlyphView$GlyphPainter.h
deleted file mode 100644
index ada0b57bfa5..00000000000
--- a/libjava/javax/swing/text/GlyphView$GlyphPainter.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GlyphView$GlyphPainter__
-#define __javax_swing_text_GlyphView$GlyphPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GlyphView;
-          class GlyphView$GlyphPainter;
-          class Position$Bias;
-          class TabExpander;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GlyphView$GlyphPainter : public ::java::lang::Object
-{
-
-public:
-  GlyphView$GlyphPainter();
-  virtual jfloat getAscent(::javax::swing::text::GlyphView *) = 0;
-  virtual jfloat getDescent(::javax::swing::text::GlyphView *) = 0;
-  virtual jfloat getHeight(::javax::swing::text::GlyphView *) = 0;
-  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat) = 0;
-  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint) = 0;
-  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *) = 0;
-  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
-  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat) = 0;
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::javax::swing::text::GlyphView$GlyphPainter * getPainter(::javax::swing::text::GlyphView *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GlyphView$GlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h b/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h
deleted file mode 100644
index a93512ae58f..00000000000
--- a/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GlyphView$J2DGlyphPainter__
-#define __javax_swing_text_GlyphView$J2DGlyphPainter__
-
-#pragma interface
-
-#include <javax/swing/text/GlyphView$GlyphPainter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class TextLayout;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GlyphView;
-          class GlyphView$GlyphPainter;
-          class GlyphView$J2DGlyphPainter;
-          class Position$Bias;
-          class TabExpander;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GlyphView$J2DGlyphPainter : public ::javax::swing::text::GlyphView$GlyphPainter
-{
-
-public: // actually package-private
-  GlyphView$J2DGlyphPainter(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-public:
-  virtual ::javax::swing::text::GlyphView$GlyphPainter * getPainter(::javax::swing::text::GlyphView *, jint, jint);
-  virtual jfloat getAscent(::javax::swing::text::GlyphView *);
-  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat);
-  virtual jfloat getDescent(::javax::swing::text::GlyphView *);
-  virtual jfloat getHeight(::javax::swing::text::GlyphView *);
-  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat);
-  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
-  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint);
-  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually package-private
-  ::java::awt::font::TextLayout * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView$GlyphPainter)))) textLayout;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GlyphView$J2DGlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView.h b/libjava/javax/swing/text/GlyphView.h
deleted file mode 100644
index e63c5077e77..00000000000
--- a/libjava/javax/swing/text/GlyphView.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GlyphView__
-#define __javax_swing_text_GlyphView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class GlyphView;
-          class GlyphView$GlyphPainter;
-          class Position$Bias;
-          class Segment;
-          class TabExpander;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GlyphView : public ::javax::swing::text::View
-{
-
-public:
-  GlyphView(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::GlyphView$GlyphPainter * getGlyphPainter();
-  virtual void setGlyphPainter(::javax::swing::text::GlyphView$GlyphPainter *);
-public: // actually protected
-  virtual void checkPainter();
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::javax::swing::text::TabExpander * getTabExpander();
-  virtual jfloat getTabbedSpan(jfloat, ::javax::swing::text::TabExpander *);
-  virtual jfloat getPartialSpan(jint, jint);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::javax::swing::text::Segment * getText(jint, jint);
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::awt::Color * getBackground();
-  virtual jboolean isStrikeThrough();
-  virtual jboolean isSubscript();
-  virtual jboolean isSuperscript();
-  virtual jboolean isUnderline();
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-private:
-  jint getBreakLocation(jint, jint);
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual ::javax::swing::text::View * createFragment(jint, jint);
-  virtual jfloat getAlignment(jint);
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually package-private
-  ::javax::swing::text::GlyphView$GlyphPainter * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) glyphPainter;
-private:
-  jint offset;
-  jint length;
-  jfloat tabX;
-  ::javax::swing::text::TabExpander * tabExpander;
-  ::javax::swing::text::Segment * cached;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GlyphView__
diff --git a/libjava/javax/swing/text/Highlighter$Highlight.h b/libjava/javax/swing/text/Highlighter$Highlight.h
deleted file mode 100644
index 92ae0f430ef..00000000000
--- a/libjava/javax/swing/text/Highlighter$Highlight.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Highlighter$Highlight__
-#define __javax_swing_text_Highlighter$Highlight__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Highlighter$Highlight;
-          class Highlighter$HighlightPainter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Highlighter$Highlight : public ::java::lang::Object
-{
-
-public:
-  virtual jint getEndOffset() = 0;
-  virtual jint getStartOffset() = 0;
-  virtual ::javax::swing::text::Highlighter$HighlightPainter * getPainter() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Highlighter$Highlight__
diff --git a/libjava/javax/swing/text/Highlighter$HighlightPainter.h b/libjava/javax/swing/text/Highlighter$HighlightPainter.h
deleted file mode 100644
index 8a0987579bf..00000000000
--- a/libjava/javax/swing/text/Highlighter$HighlightPainter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Highlighter$HighlightPainter__
-#define __javax_swing_text_Highlighter$HighlightPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Highlighter$HighlightPainter : public ::java::lang::Object
-{
-
-public:
-  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Highlighter$HighlightPainter__
diff --git a/libjava/javax/swing/text/Highlighter.h b/libjava/javax/swing/text/Highlighter.h
deleted file mode 100644
index 2f947d226d2..00000000000
--- a/libjava/javax/swing/text/Highlighter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Highlighter__
-#define __javax_swing_text_Highlighter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Highlighter;
-          class Highlighter$Highlight;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Highlighter : public ::java::lang::Object
-{
-
-public:
-  virtual void install(::javax::swing::text::JTextComponent *) = 0;
-  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
-  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *) = 0;
-  virtual void removeAllHighlights() = 0;
-  virtual void removeHighlight(::java::lang::Object *) = 0;
-  virtual void changeHighlight(::java::lang::Object *, jint, jint) = 0;
-  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Highlighter__
diff --git a/libjava/javax/swing/text/IconView.h b/libjava/javax/swing/text/IconView.h
deleted file mode 100644
index cc47c48a248..00000000000
--- a/libjava/javax/swing/text/IconView.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_IconView__
-#define __javax_swing_text_IconView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class IconView;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::IconView : public ::javax::swing::text::View
-{
-
-public:
-  IconView(::javax::swing::text::Element *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jfloat getAlignment(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_IconView__
diff --git a/libjava/javax/swing/text/InternationalFormatter.h b/libjava/javax/swing/text/InternationalFormatter.h
deleted file mode 100644
index e0c44dd44e1..00000000000
--- a/libjava/javax/swing/text/InternationalFormatter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_InternationalFormatter__
-#define __javax_swing_text_InternationalFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultFormatter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Format;
-        class Format$Field;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JFormattedTextField;
-      namespace text
-      {
-          class InternationalFormatter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::InternationalFormatter : public ::javax::swing::text::DefaultFormatter
-{
-
-public:
-  InternationalFormatter();
-  InternationalFormatter(::java::text::Format *);
-  virtual void setFormat(::java::text::Format *);
-  virtual ::java::text::Format * getFormat();
-  virtual void setMinimum(::java::lang::Comparable *);
-  virtual ::java::lang::Comparable * getMinimum();
-  virtual void setMaximum(::java::lang::Comparable *);
-  virtual ::java::lang::Comparable * getMaximum();
-  virtual void install(::javax::swing::JFormattedTextField *);
-  virtual ::java::lang::String * valueToString(::java::lang::Object *);
-  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
-  virtual JArray< ::java::text::Format$Field * > * getFields(jint);
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual JArray< ::javax::swing::Action * > * getActions();
-private:
-  static const jlong serialVersionUID = 2436068675711756856LL;
-public: // actually package-private
-  ::java::text::Format * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultFormatter)))) format;
-  ::java::lang::Comparable * minimum;
-  ::java::lang::Comparable * maximum;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_InternationalFormatter__
diff --git a/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h b/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h
deleted file mode 100644
index ea8552a664a..00000000000
--- a/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$AccessibleJTextComponent__
-#define __javax_swing_text_JTextComponent$AccessibleJTextComponent__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleEditableText;
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleText;
-    }
-    namespace swing
-    {
-      namespace event
-      {
-          class CaretEvent;
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class JTextComponent;
-          class JTextComponent$AccessibleJTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$AccessibleJTextComponent : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JTextComponent$AccessibleJTextComponent(::javax::swing::text::JTextComponent *);
-  virtual jint getCaretPosition();
-  virtual ::java::lang::String * getSelectedText();
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual void caretUpdate(::javax::swing::event::CaretEvent *);
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleEditableText * getAccessibleEditableText();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getCharCount();
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
-  virtual ::java::lang::String * getAtIndex(jint, jint);
-  virtual ::java::lang::String * getAfterIndex(jint, jint);
-  virtual ::java::lang::String * getBeforeIndex(jint, jint);
-private:
-  ::java::lang::String * getAtIndexImpl(jint, jint, jint);
-public:
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  virtual void setTextContents(::java::lang::String *);
-  virtual void insertTextAtIndex(jint, ::java::lang::String *);
-  virtual ::java::lang::String * getTextRange(jint, jint);
-  virtual void delete$(jint, jint);
-  virtual void cut(jint, jint);
-  virtual void paste(jint);
-  virtual void replaceText(jint, jint, ::java::lang::String *);
-  virtual void selectText(jint, jint);
-  virtual void setAttributes(jint, jint, ::javax::swing::text::AttributeSet *);
-private:
-  static const jlong serialVersionUID = 7664188944091413696LL;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) caretDot;
-public: // actually package-private
-  ::javax::swing::text::JTextComponent * this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$AccessibleJTextComponent__
diff --git a/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h b/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h
deleted file mode 100644
index 0e61fb476b7..00000000000
--- a/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$DefaultKeymap__
-#define __javax_swing_text_JTextComponent$DefaultKeymap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class KeyStroke;
-      namespace text
-      {
-          class JTextComponent$DefaultKeymap;
-          class Keymap;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$DefaultKeymap : public ::java::lang::Object
-{
-
-public:
-  JTextComponent$DefaultKeymap(::java::lang::String *);
-  virtual void addActionForKeyStroke(::javax::swing::KeyStroke *, ::javax::swing::Action *);
-  virtual ::javax::swing::Action * getAction(::javax::swing::KeyStroke *);
-  virtual JArray< ::javax::swing::Action * > * getBoundActions();
-  virtual JArray< ::javax::swing::KeyStroke * > * getBoundKeyStrokes();
-  virtual ::javax::swing::Action * getDefaultAction();
-  virtual JArray< ::javax::swing::KeyStroke * > * getKeyStrokesForAction(::javax::swing::Action *);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::text::Keymap * getResolveParent();
-  virtual jboolean isLocallyDefined(::javax::swing::KeyStroke *);
-  virtual void removeBindings();
-  virtual void removeKeyStrokeBinding(::javax::swing::KeyStroke *);
-  virtual void setDefaultAction(::javax::swing::Action *);
-  virtual void setResolveParent(::javax::swing::text::Keymap *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::javax::swing::text::Keymap * parent;
-  ::java::util::Hashtable * map;
-  ::javax::swing::Action * defaultAction;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$DefaultKeymap__
diff --git a/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h b/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h
deleted file mode 100644
index bdd3c56a82b..00000000000
--- a/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$DefaultTransferHandler__
-#define __javax_swing_text_JTextComponent$DefaultTransferHandler__
-
-#pragma interface
-
-#include <javax/swing/TransferHandler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class DataFlavor;
-          class Transferable;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace text
-      {
-          class JTextComponent;
-          class JTextComponent$DefaultTransferHandler;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$DefaultTransferHandler : public ::javax::swing::TransferHandler
-{
-
-public: // actually package-private
-  JTextComponent$DefaultTransferHandler(::javax::swing::text::JTextComponent *);
-public:
-  virtual jboolean canImport(::javax::swing::JComponent *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
-  virtual void exportToClipboard(::javax::swing::JComponent *, ::java::awt::datatransfer::Clipboard *, jint);
-  virtual jint getSourceActions();
-  virtual jboolean importData(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *);
-public: // actually package-private
-  ::javax::swing::text::JTextComponent * __attribute__((aligned(__alignof__( ::javax::swing::TransferHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$DefaultTransferHandler__
diff --git a/libjava/javax/swing/text/JTextComponent$KeyBinding.h b/libjava/javax/swing/text/JTextComponent$KeyBinding.h
deleted file mode 100644
index e3565c96fed..00000000000
--- a/libjava/javax/swing/text/JTextComponent$KeyBinding.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$KeyBinding__
-#define __javax_swing_text_JTextComponent$KeyBinding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class KeyStroke;
-      namespace text
-      {
-          class JTextComponent$KeyBinding;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$KeyBinding : public ::java::lang::Object
-{
-
-public:
-  JTextComponent$KeyBinding(::javax::swing::KeyStroke *, ::java::lang::String *);
-  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::String * actionName;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$KeyBinding__
diff --git a/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h b/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h
deleted file mode 100644
index 9496d66b3d0..00000000000
--- a/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$KeymapActionMap__
-#define __javax_swing_text_JTextComponent$KeymapActionMap__
-
-#pragma interface
-
-#include <javax/swing/ActionMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace text
-      {
-          class JTextComponent;
-          class JTextComponent$KeymapActionMap;
-          class Keymap;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$KeymapActionMap : public ::javax::swing::ActionMap
-{
-
-public:
-  JTextComponent$KeymapActionMap(::javax::swing::text::JTextComponent *, ::javax::swing::text::Keymap *);
-  virtual ::javax::swing::Action * get(::java::lang::Object *);
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * keys();
-  virtual JArray< ::java::lang::Object * > * allKeys();
-public: // actually package-private
-  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::ActionMap)))) map;
-  ::javax::swing::text::JTextComponent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$KeymapActionMap__
diff --git a/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h b/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h
deleted file mode 100644
index 07e02f3ffe1..00000000000
--- a/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$KeymapWrapper__
-#define __javax_swing_text_JTextComponent$KeymapWrapper__
-
-#pragma interface
-
-#include <javax/swing/InputMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class KeyStroke;
-      namespace text
-      {
-          class JTextComponent;
-          class JTextComponent$KeymapWrapper;
-          class Keymap;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$KeymapWrapper : public ::javax::swing::InputMap
-{
-
-public:
-  JTextComponent$KeymapWrapper(::javax::swing::text::JTextComponent *, ::javax::swing::text::Keymap *);
-  virtual jint size();
-  virtual ::java::lang::Object * get(::javax::swing::KeyStroke *);
-  virtual JArray< ::javax::swing::KeyStroke * > * keys();
-  virtual JArray< ::javax::swing::KeyStroke * > * allKeys();
-public: // actually package-private
-  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::InputMap)))) map;
-  ::javax::swing::text::JTextComponent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$KeymapWrapper__
diff --git a/libjava/javax/swing/text/JTextComponent.h b/libjava/javax/swing/text/JTextComponent.h
deleted file mode 100644
index cbaec01315a..00000000000
--- a/libjava/javax/swing/text/JTextComponent.h
+++ /dev/null
@@ -1,173 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent__
-#define __javax_swing_text_JTextComponent__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Insets;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class InputMethodListener;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-      namespace event
-      {
-          class CaretEvent;
-          class CaretListener;
-      }
-      namespace plaf
-      {
-          class TextUI;
-      }
-      namespace text
-      {
-          class Caret;
-          class Document;
-          class Highlighter;
-          class JTextComponent;
-          class JTextComponent$DefaultTransferHandler;
-          class JTextComponent$KeyBinding;
-          class Keymap;
-          class NavigationFilter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent : public ::javax::swing::JComponent
-{
-
-public:
-  static ::javax::swing::text::Keymap * getKeymap(::java::lang::String *);
-  static ::javax::swing::text::Keymap * removeKeymap(::java::lang::String *);
-  static ::javax::swing::text::Keymap * addKeymap(::java::lang::String *, ::javax::swing::text::Keymap *);
-  virtual ::javax::swing::text::Keymap * getKeymap();
-  virtual void setKeymap(::javax::swing::text::Keymap *);
-  static void loadKeymap(::javax::swing::text::Keymap *, JArray< ::javax::swing::text::JTextComponent$KeyBinding * > *, JArray< ::javax::swing::Action * > *);
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  JTextComponent();
-  virtual void setDocument(::javax::swing::text::Document *);
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void setMargin(::java::awt::Insets *);
-  virtual ::java::awt::Insets * getMargin();
-  virtual void setText(::java::lang::String *);
-  virtual ::java::lang::String * getText();
-  virtual ::java::lang::String * getText(jint, jint);
-  virtual ::java::lang::String * getSelectedText();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::swing::plaf::TextUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TextUI *);
-  virtual void updateUI();
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jboolean isEditable();
-  virtual void setEditable(jboolean);
-  virtual ::javax::swing::text::Caret * getCaret();
-  virtual void setCaret(::javax::swing::text::Caret *);
-  virtual ::java::awt::Color * getCaretColor();
-  virtual void setCaretColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getDisabledTextColor();
-  virtual void setDisabledTextColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getSelectedTextColor();
-  virtual void setSelectedTextColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getSelectionColor();
-  virtual void setSelectionColor(::java::awt::Color *);
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual void moveCaretPosition(jint);
-  virtual ::javax::swing::text::Highlighter * getHighlighter();
-  virtual void setHighlighter(::javax::swing::text::Highlighter *);
-  virtual jint getSelectionStart();
-  virtual void setSelectionStart(jint);
-  virtual jint getSelectionEnd();
-  virtual void setSelectionEnd(jint);
-  virtual void select(jint, jint);
-  virtual void selectAll();
-  virtual void replaceSelection(::java::lang::String *);
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual void addCaretListener(::javax::swing::event::CaretListener *);
-  virtual void removeCaretListener(::javax::swing::event::CaretListener *);
-  virtual JArray< ::javax::swing::event::CaretListener * > * getCaretListeners();
-public: // actually protected
-  virtual void fireCaretUpdate(::javax::swing::event::CaretEvent *);
-public:
-  virtual void addInputMethodListener(::java::awt::event::InputMethodListener *);
-  virtual void removeInputMethodListener(::java::awt::event::InputMethodListener *);
-  virtual JArray< ::java::awt::event::InputMethodListener * > * getInputMethodListeners();
-  virtual ::java::awt::Rectangle * modelToView(jint);
-  virtual jboolean getDragEnabled();
-  virtual void setDragEnabled(jboolean);
-  virtual jint viewToModel(::java::awt::Point *);
-  virtual void copy();
-  virtual void cut();
-  virtual void paste();
-private:
-  void doTransferAction(::java::lang::String *, ::javax::swing::Action *);
-public:
-  virtual void setFocusAccelerator(jchar);
-  virtual jchar getFocusAccelerator();
-  virtual ::javax::swing::text::NavigationFilter * getNavigationFilter();
-  virtual void setNavigationFilter(::javax::swing::text::NavigationFilter *);
-  virtual void read(::java::io::Reader *, ::java::lang::Object *);
-  virtual void write(::java::io::Writer *);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-private:
-  static const jlong serialVersionUID = -8796518220218978795LL;
-public:
-  static ::java::lang::String * DEFAULT_KEYMAP;
-  static ::java::lang::String * FOCUS_ACCELERATOR_KEY;
-private:
-  static ::javax::swing::text::JTextComponent$DefaultTransferHandler * defaultTransferHandler;
-  static ::java::util::Hashtable * keymaps;
-  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) keymap;
-  jchar focusAccelerator;
-  ::javax::swing::text::NavigationFilter * navigationFilter;
-public: // actually package-private
-  ::javax::swing::text::Document * doc;
-  ::javax::swing::text::Caret * caret;
-  jboolean editable;
-private:
-  ::javax::swing::text::Highlighter * highlighter;
-  ::java::awt::Color * caretColor;
-  ::java::awt::Color * disabledTextColor;
-  ::java::awt::Color * selectedTextColor;
-  ::java::awt::Color * selectionColor;
-  ::java::awt::Insets * margin;
-  jboolean dragEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent__
diff --git a/libjava/javax/swing/text/Keymap.h b/libjava/javax/swing/text/Keymap.h
deleted file mode 100644
index 6ec0a9816bf..00000000000
--- a/libjava/javax/swing/text/Keymap.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Keymap__
-#define __javax_swing_text_Keymap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class KeyStroke;
-      namespace text
-      {
-          class Keymap;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Keymap : public ::java::lang::Object
-{
-
-public:
-  virtual void addActionForKeyStroke(::javax::swing::KeyStroke *, ::javax::swing::Action *) = 0;
-  virtual ::javax::swing::Action * getAction(::javax::swing::KeyStroke *) = 0;
-  virtual JArray< ::javax::swing::Action * > * getBoundActions() = 0;
-  virtual JArray< ::javax::swing::KeyStroke * > * getBoundKeyStrokes() = 0;
-  virtual ::javax::swing::Action * getDefaultAction() = 0;
-  virtual JArray< ::javax::swing::KeyStroke * > * getKeyStrokesForAction(::javax::swing::Action *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::swing::text::Keymap * getResolveParent() = 0;
-  virtual jboolean isLocallyDefined(::javax::swing::KeyStroke *) = 0;
-  virtual void removeBindings() = 0;
-  virtual void removeKeyStrokeBinding(::javax::swing::KeyStroke *) = 0;
-  virtual void setDefaultAction(::javax::swing::Action *) = 0;
-  virtual void setResolveParent(::javax::swing::text::Keymap *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Keymap__
diff --git a/libjava/javax/swing/text/LabelView.h b/libjava/javax/swing/text/LabelView.h
deleted file mode 100644
index 0d616b22883..00000000000
--- a/libjava/javax/swing/text/LabelView.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_LabelView__
-#define __javax_swing_text_LabelView__
-
-#pragma interface
-
-#include <javax/swing/text/GlyphView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class LabelView;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::LabelView : public ::javax::swing::text::GlyphView
-{
-
-public:
-  LabelView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual ::java::awt::Color * getBackground();
-public: // actually protected
-  virtual void setBackground(::java::awt::Color *);
-public:
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::awt::Font * getFont();
-public: // actually protected
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-public:
-  virtual jboolean isUnderline();
-public: // actually protected
-  virtual void setUnderline(jboolean);
-public:
-  virtual jboolean isSubscript();
-public: // actually protected
-  virtual void setSubscript(jboolean);
-public:
-  virtual jboolean isSuperscript();
-public: // actually protected
-  virtual void setSuperscript(jboolean);
-public:
-  virtual jboolean isStrikeThrough();
-public: // actually protected
-  virtual void setStrikeThrough(jboolean);
-public: // actually package-private
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView)))) background;
-  ::java::awt::Color * foreground;
-  ::java::awt::Font * font;
-  jboolean strikeThrough;
-  jboolean underline;
-  jboolean subscript;
-  jboolean superscript;
-private:
-  jboolean valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_LabelView__
diff --git a/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h b/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h
deleted file mode 100644
index 306061f2bbd..00000000000
--- a/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_LayeredHighlighter$LayerPainter__
-#define __javax_swing_text_LayeredHighlighter$LayerPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class JTextComponent;
-          class LayeredHighlighter$LayerPainter;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::LayeredHighlighter$LayerPainter : public ::java::lang::Object
-{
-
-public:
-  LayeredHighlighter$LayerPainter();
-  virtual ::java::awt::Shape * paintLayer(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *) = 0;
-  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_LayeredHighlighter$LayerPainter__
diff --git a/libjava/javax/swing/text/LayeredHighlighter.h b/libjava/javax/swing/text/LayeredHighlighter.h
deleted file mode 100644
index 504680a41e4..00000000000
--- a/libjava/javax/swing/text/LayeredHighlighter.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_LayeredHighlighter__
-#define __javax_swing_text_LayeredHighlighter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Highlighter$Highlight;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-          class LayeredHighlighter;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::LayeredHighlighter : public ::java::lang::Object
-{
-
-public:
-  LayeredHighlighter();
-  virtual void paintLayeredHighlights(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *) = 0;
-  virtual void install(::javax::swing::text::JTextComponent *) = 0;
-  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
-  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *) = 0;
-  virtual void removeAllHighlights() = 0;
-  virtual void removeHighlight(::java::lang::Object *) = 0;
-  virtual void changeHighlight(::java::lang::Object *, jint, jint) = 0;
-  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_LayeredHighlighter__
diff --git a/libjava/javax/swing/text/LayoutQueue.h b/libjava/javax/swing/text/LayoutQueue.h
deleted file mode 100644
index 0dcc8a7977c..00000000000
--- a/libjava/javax/swing/text/LayoutQueue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_LayoutQueue__
-#define __javax_swing_text_LayoutQueue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class LayoutQueue;
-      }
-    }
-  }
-}
-
-class javax::swing::text::LayoutQueue : public ::java::lang::Object
-{
-
-public:
-  LayoutQueue();
-  virtual void addTask(::java::lang::Runnable *);
-public: // actually protected
-  virtual ::java::lang::Runnable * waitForWork();
-public:
-  static ::javax::swing::text::LayoutQueue * getDefaultQueue();
-  static void setDefaultQueue(::javax::swing::text::LayoutQueue *);
-private:
-  static ::javax::swing::text::LayoutQueue * defaultQueue;
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_LayoutQueue__
diff --git a/libjava/javax/swing/text/MaskFormatter.h b/libjava/javax/swing/text/MaskFormatter.h
deleted file mode 100644
index d8651afc956..00000000000
--- a/libjava/javax/swing/text/MaskFormatter.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_MaskFormatter__
-#define __javax_swing_text_MaskFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultFormatter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-      namespace text
-      {
-          class MaskFormatter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::MaskFormatter : public ::javax::swing::text::DefaultFormatter
-{
-
-public:
-  MaskFormatter();
-  MaskFormatter(::java::lang::String *);
-  virtual ::java::lang::String * getMask();
-  virtual ::java::lang::String * getInvalidCharacters();
-  virtual void setInvalidCharacters(::java::lang::String *);
-  virtual ::java::lang::String * getValidCharacters();
-  virtual void setValidCharacters(::java::lang::String *);
-  virtual ::java::lang::String * getPlaceholder();
-  virtual void setPlaceholder(::java::lang::String *);
-  virtual jchar getPlaceholderCharacter();
-  virtual void setPlaceholderCharacter(jchar);
-  virtual jboolean getValueContainsLiteralCharacters();
-  virtual void setValueContainsLiteralCharacters(jboolean);
-  virtual void setMask(::java::lang::String *);
-  virtual void install(::javax::swing::JFormattedTextField *);
-  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
-private:
-  ::java::lang::String * convertStringToValue(::java::lang::String *);
-public:
-  virtual ::java::lang::String * valueToString(::java::lang::Object *);
-private:
-  ::java::lang::String * convertValueToString(::java::lang::String *);
-  static const jchar NUM_CHAR = 35;
-  static const jchar ESCAPE_CHAR = 39;
-  static const jchar UPPERCASE_CHAR = 85;
-  static const jchar LOWERCASE_CHAR = 76;
-  static const jchar ALPHANUM_CHAR = 65;
-  static const jchar LETTER_CHAR = 63;
-  static const jchar ANYTHING_CHAR = 42;
-  static const jchar HEX_CHAR = 72;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultFormatter)))) mask;
-  ::java::lang::String * invalidChars;
-  ::java::lang::String * validChars;
-  ::java::lang::String * placeHolder;
-  jchar placeHolderChar;
-  jboolean valueContainsLiteralCharacters;
-  static ::java::lang::String * hexString;
-public: // actually package-private
-  jint maskLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_MaskFormatter__
diff --git a/libjava/javax/swing/text/MutableAttributeSet.h b/libjava/javax/swing/text/MutableAttributeSet.h
deleted file mode 100644
index d98305585f3..00000000000
--- a/libjava/javax/swing/text/MutableAttributeSet.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_MutableAttributeSet__
-#define __javax_swing_text_MutableAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::MutableAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void addAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual void removeAttribute(::java::lang::Object *) = 0;
-  virtual void removeAttributes(::java::util::Enumeration *) = 0;
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *) = 0;
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
-  virtual jint getAttributeCount() = 0;
-  virtual ::java::util::Enumeration * getAttributeNames() = 0;
-  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
-  virtual jboolean isDefined(::java::lang::Object *) = 0;
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_MutableAttributeSet__
diff --git a/libjava/javax/swing/text/NavigationFilter$FilterBypass.h b/libjava/javax/swing/text/NavigationFilter$FilterBypass.h
deleted file mode 100644
index 5c771e222ac..00000000000
--- a/libjava/javax/swing/text/NavigationFilter$FilterBypass.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_NavigationFilter$FilterBypass__
-#define __javax_swing_text_NavigationFilter$FilterBypass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class NavigationFilter$FilterBypass;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::NavigationFilter$FilterBypass : public ::java::lang::Object
-{
-
-public:
-  NavigationFilter$FilterBypass();
-  virtual ::javax::swing::text::Caret * getCaret() = 0;
-  virtual void moveDot(jint, ::javax::swing::text::Position$Bias *) = 0;
-  virtual void setDot(jint, ::javax::swing::text::Position$Bias *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_NavigationFilter$FilterBypass__
diff --git a/libjava/javax/swing/text/NavigationFilter.h b/libjava/javax/swing/text/NavigationFilter.h
deleted file mode 100644
index 533b6e50d1a..00000000000
--- a/libjava/javax/swing/text/NavigationFilter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_NavigationFilter__
-#define __javax_swing_text_NavigationFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class JTextComponent;
-          class NavigationFilter;
-          class NavigationFilter$FilterBypass;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::NavigationFilter : public ::java::lang::Object
-{
-
-public:
-  NavigationFilter();
-  virtual void moveDot(::javax::swing::text::NavigationFilter$FilterBypass *, jint, ::javax::swing::text::Position$Bias *);
-  virtual void setDot(::javax::swing::text::NavigationFilter$FilterBypass *, jint, ::javax::swing::text::Position$Bias *);
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_NavigationFilter__
diff --git a/libjava/javax/swing/text/NumberFormatter.h b/libjava/javax/swing/text/NumberFormatter.h
deleted file mode 100644
index fe952fe468b..00000000000
--- a/libjava/javax/swing/text/NumberFormatter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_NumberFormatter__
-#define __javax_swing_text_NumberFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/InternationalFormatter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Format;
-        class NumberFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class NumberFormatter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::NumberFormatter : public ::javax::swing::text::InternationalFormatter
-{
-
-public:
-  NumberFormatter();
-  NumberFormatter(::java::text::NumberFormat *);
-  virtual void setFormat(::java::text::Format *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_NumberFormatter__
diff --git a/libjava/javax/swing/text/ParagraphView$Row.h b/libjava/javax/swing/text/ParagraphView$Row.h
deleted file mode 100644
index 36a372a7098..00000000000
--- a/libjava/javax/swing/text/ParagraphView$Row.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ParagraphView$Row__
-#define __javax_swing_text_ParagraphView$Row__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace text
-      {
-          class Element;
-          class ParagraphView;
-          class ParagraphView$Row;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ParagraphView$Row : public ::javax::swing::text::BoxView
-{
-
-public: // actually package-private
-  ParagraphView$Row(::javax::swing::text::ParagraphView *, ::javax::swing::text::Element *);
-public:
-  virtual jshort getLeftInset();
-  virtual jfloat getAlignment(jint);
-public: // actually protected
-  virtual jint getViewIndexAtPosition(jint);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-public:
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-public: // actually package-private
-  ::javax::swing::text::ParagraphView * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ParagraphView$Row__
diff --git a/libjava/javax/swing/text/ParagraphView.h b/libjava/javax/swing/text/ParagraphView.h
deleted file mode 100644
index fc86f73989a..00000000000
--- a/libjava/javax/swing/text/ParagraphView.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ParagraphView__
-#define __javax_swing_text_ParagraphView__
-
-#pragma interface
-
-#include <javax/swing/text/FlowView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class ParagraphView;
-          class ParagraphView$Row;
-          class Position$Bias;
-          class TabSet;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ParagraphView : public ::javax::swing::text::FlowView
-{
-
-public:
-  ParagraphView(::javax::swing::text::Element *);
-  virtual jfloat nextTabStop(jfloat, jint);
-public: // actually protected
-  virtual ::javax::swing::text::View * createRow();
-public:
-  virtual jfloat getAlignment(jint);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual void setFirstLineIndent(jfloat);
-  virtual void setJustification(jint);
-  virtual void setLineSpacing(jfloat);
-  virtual ::javax::swing::text::View * getLayoutView(jint);
-  virtual jint getLayoutViewCount();
-  virtual ::javax::swing::text::TabSet * getTabSet();
-  virtual jint findOffsetToCharactersInString(JArray< jchar > *, jint);
-  virtual jint getClosestPositionTo(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *, jint, jint);
-  virtual jfloat getPartialSize(jint, jint);
-  virtual jfloat getTabBase();
-  virtual void adjustRow(::javax::swing::text::ParagraphView$Row *, jint, jint);
-public:
-  virtual ::javax::swing::text::View * breakView(jint, jfloat, ::java::awt::Shape *);
-  virtual jint getBreakWeight(jint, jfloat);
-public: // actually package-private
-  static jint access$0(::javax::swing::text::ParagraphView *);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::FlowView)))) firstLineIndent;
-private:
-  jint justification;
-  jfloat lineSpacing;
-  ::javax::swing::text::TabSet * tabSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ParagraphView__
diff --git a/libjava/javax/swing/text/PasswordView.h b/libjava/javax/swing/text/PasswordView.h
deleted file mode 100644
index ba6d3ff4762..00000000000
--- a/libjava/javax/swing/text/PasswordView.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_PasswordView__
-#define __javax_swing_text_PasswordView__
-
-#pragma interface
-
-#include <javax/swing/text/FieldView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class PasswordView;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::PasswordView : public ::javax::swing::text::FieldView
-{
-
-public:
-  PasswordView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual jint drawEchoCharacter(::java::awt::Graphics *, jint, jint, jchar);
-private:
-  jchar getEchoChar();
-public: // actually protected
-  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-private:
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::javax::swing::text::FieldView)))) oneCharBuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_PasswordView__
diff --git a/libjava/javax/swing/text/PlainDocument.h b/libjava/javax/swing/text/PlainDocument.h
deleted file mode 100644
index d3dc0dca6e2..00000000000
--- a/libjava/javax/swing/text/PlainDocument.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_PlainDocument__
-#define __javax_swing_text_PlainDocument__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$AbstractElement;
-          class AbstractDocument$Content;
-          class AbstractDocument$DefaultDocumentEvent;
-          class AttributeSet;
-          class Element;
-          class PlainDocument;
-      }
-    }
-  }
-}
-
-class javax::swing::text::PlainDocument : public ::javax::swing::text::AbstractDocument
-{
-
-public:
-  PlainDocument();
-  PlainDocument(::javax::swing::text::AbstractDocument$Content *);
-private:
-  void reindex();
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
-  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
-  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public:
-  virtual ::javax::swing::text::Element * getDefaultRootElement();
-  virtual ::javax::swing::text::Element * getParagraphElement(jint);
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-private:
-  static const jlong serialVersionUID = 4758290289196893664LL;
-public:
-  static ::java::lang::String * lineLimitAttribute;
-  static ::java::lang::String * tabSizeAttribute;
-private:
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument)))) rootElement;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_PlainDocument__
diff --git a/libjava/javax/swing/text/PlainView.h b/libjava/javax/swing/text/PlainView.h
deleted file mode 100644
index e6091b0fc1c..00000000000
--- a/libjava/javax/swing/text/PlainView.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_PlainView__
-#define __javax_swing_text_PlainView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class PlainView;
-          class Position$Bias;
-          class Segment;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::PlainView : public ::javax::swing::text::View
-{
-
-public:
-  PlainView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual void updateMetrics();
-  virtual ::java::awt::Rectangle * lineToRect(::java::awt::Shape *, jint);
-public:
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-public: // actually protected
-  virtual void drawLine(jint, ::java::awt::Graphics *, jint, jint);
-  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-public: // actually protected
-  virtual jint getTabSize();
-public:
-  virtual jfloat nextTabStop(jfloat, jint);
-public: // actually package-private
-  virtual jfloat determineMaxLineLength();
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually protected
-  virtual void updateDamage(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual void damageLineRange(jint, jint, ::java::awt::Shape *, ::java::awt::Component *);
-  virtual ::javax::swing::text::Segment * getLineBuffer();
-private:
-  void findLongestLine(jint, jint);
-  jint getLineLength(jint);
-public: // actually package-private
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) selectedColor;
-  ::java::awt::Color * unselectedColor;
-  ::java::awt::Color * disabledColor;
-  jint selectionStart;
-  jint selectionEnd;
-  ::java::awt::Font * font;
-  jfloat maxLineLength;
-  ::javax::swing::text::Element * longestLine;
-public: // actually protected
-  ::java::awt::FontMetrics * metrics;
-private:
-  ::javax::swing::text::Segment * lineBuffer;
-  jint tabBase;
-  jint tabSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_PlainView__
diff --git a/libjava/javax/swing/text/Position$Bias.h b/libjava/javax/swing/text/Position$Bias.h
deleted file mode 100644
index 0ae5a3570a1..00000000000
--- a/libjava/javax/swing/text/Position$Bias.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Position$Bias__
-#define __javax_swing_text_Position$Bias__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Position$Bias : public ::java::lang::Object
-{
-
-  Position$Bias(::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-  static ::javax::swing::text::Position$Bias * Backward;
-  static ::javax::swing::text::Position$Bias * Forward;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_Position$Bias__
diff --git a/libjava/javax/swing/text/Position.h b/libjava/javax/swing/text/Position.h
deleted file mode 100644
index 1561b25fc1c..00000000000
--- a/libjava/javax/swing/text/Position.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Position__
-#define __javax_swing_text_Position__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Position;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Position : public ::java::lang::Object
-{
-
-public:
-  virtual jint getOffset() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Position__
diff --git a/libjava/javax/swing/text/Segment.h b/libjava/javax/swing/text/Segment.h
deleted file mode 100644
index f9d5d5a6e42..00000000000
--- a/libjava/javax/swing/text/Segment.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Segment__
-#define __javax_swing_text_Segment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Segment;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Segment : public ::java::lang::Object
-{
-
-public:
-  Segment();
-  Segment(JArray< jchar > *, jint, jint);
-  virtual ::java::lang::Object * clone();
-  virtual jchar current();
-  virtual jchar first();
-  virtual jint getBeginIndex();
-  virtual jint getEndIndex();
-  virtual jint getIndex();
-  virtual jchar last();
-  virtual jchar next();
-  virtual jchar previous();
-  virtual jchar setIndex(jint);
-  virtual ::java::lang::String * toString();
-  virtual void setPartialReturn(jboolean);
-  virtual jboolean isPartialReturn();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) partialReturn;
-  jint current__;
-public:
-  JArray< jchar > * array;
-  jint count;
-  jint offset;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_Segment__
diff --git a/libjava/javax/swing/text/SimpleAttributeSet.h b/libjava/javax/swing/text/SimpleAttributeSet.h
deleted file mode 100644
index 0ea91af02f7..00000000000
--- a/libjava/javax/swing/text/SimpleAttributeSet.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_SimpleAttributeSet__
-#define __javax_swing_text_SimpleAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class SimpleAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::SimpleAttributeSet : public ::java::lang::Object
-{
-
-public:
-  SimpleAttributeSet();
-  SimpleAttributeSet(::javax::swing::text::AttributeSet *);
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual void addAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  virtual jboolean containsAttributeLocally(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual jint hashCode();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEmpty();
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-  virtual void removeAttribute(::java::lang::Object *);
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttributes(::java::util::Enumeration *);
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8267656273837665219LL;
-public:
-  static ::javax::swing::text::AttributeSet * EMPTY;
-public: // actually package-private
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tab;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_SimpleAttributeSet__
diff --git a/libjava/javax/swing/text/StringContent$InsertUndo.h b/libjava/javax/swing/text/StringContent$InsertUndo.h
deleted file mode 100644
index 49415c169d0..00000000000
--- a/libjava/javax/swing/text/StringContent$InsertUndo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$InsertUndo__
-#define __javax_swing_text_StringContent$InsertUndo__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$InsertUndo;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$InsertUndo : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  StringContent$InsertUndo(::javax::swing::text::StringContent *, jint, jint);
-  virtual void undo();
-  virtual void redo();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) start;
-  jint length;
-  ::java::lang::String * redoContent;
-  ::java::util::Vector * positions;
-public: // actually package-private
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$InsertUndo__
diff --git a/libjava/javax/swing/text/StringContent$Mark.h b/libjava/javax/swing/text/StringContent$Mark.h
deleted file mode 100644
index 22d3f9f0257..00000000000
--- a/libjava/javax/swing/text/StringContent$Mark.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$Mark__
-#define __javax_swing_text_StringContent$Mark__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$Mark;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$Mark : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StringContent$Mark(::javax::swing::text::StringContent *, jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  jint refCount;
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$Mark__
diff --git a/libjava/javax/swing/text/StringContent$RemoveUndo.h b/libjava/javax/swing/text/StringContent$RemoveUndo.h
deleted file mode 100644
index 6c79aa06ba6..00000000000
--- a/libjava/javax/swing/text/StringContent$RemoveUndo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$RemoveUndo__
-#define __javax_swing_text_StringContent$RemoveUndo__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$RemoveUndo;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$RemoveUndo : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  StringContent$RemoveUndo(::javax::swing::text::StringContent *, jint, ::java::lang::String *);
-  virtual void undo();
-  virtual void redo();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) start;
-  jint len;
-  ::java::lang::String * undoString;
-public: // actually package-private
-  ::java::util::Vector * positions;
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$RemoveUndo__
diff --git a/libjava/javax/swing/text/StringContent$StickyPosition.h b/libjava/javax/swing/text/StringContent$StickyPosition.h
deleted file mode 100644
index 434bf590a7f..00000000000
--- a/libjava/javax/swing/text/StringContent$StickyPosition.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$StickyPosition__
-#define __javax_swing_text_StringContent$StickyPosition__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$Mark;
-          class StringContent$StickyPosition;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$StickyPosition : public ::java::lang::Object
-{
-
-public:
-  StringContent$StickyPosition(::javax::swing::text::StringContent *, jint);
-  virtual jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::StringContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$StickyPosition__
diff --git a/libjava/javax/swing/text/StringContent$UndoPosRef.h b/libjava/javax/swing/text/StringContent$UndoPosRef.h
deleted file mode 100644
index 82f8d2f660e..00000000000
--- a/libjava/javax/swing/text/StringContent$UndoPosRef.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$UndoPosRef__
-#define __javax_swing_text_StringContent$UndoPosRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$Mark;
-          class StringContent$UndoPosRef;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$UndoPosRef : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StringContent$UndoPosRef(::javax::swing::text::StringContent *, ::javax::swing::text::StringContent$Mark *);
-  virtual void reset();
-private:
-  ::javax::swing::text::StringContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  jint undoOffset;
-public: // actually package-private
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$UndoPosRef__
diff --git a/libjava/javax/swing/text/StringContent.h b/libjava/javax/swing/text/StringContent.h
deleted file mode 100644
index ca51a43d7e3..00000000000
--- a/libjava/javax/swing/text/StringContent.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent__
-#define __javax_swing_text_StringContent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Position;
-          class Segment;
-          class StringContent;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent : public ::java::lang::Object
-{
-
-public:
-  StringContent();
-  StringContent(jint);
-public: // actually protected
-  ::java::util::Vector * getPositionsInRange(::java::util::Vector *, jint, jint);
-public:
-  ::javax::swing::text::Position * createPosition(jint);
-  jint length();
-  ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *);
-  ::javax::swing::undo::UndoableEdit * remove(jint, jint);
-private:
-  void replace(jint, jint, JArray< jchar > *);
-public:
-  ::java::lang::String * getString(jint, jint);
-  void getChars(jint, jint, ::javax::swing::text::Segment *);
-public: // actually protected
-  void updateUndoPositions(::java::util::Vector *);
-public: // actually package-private
-  void checkLocation(jint, jint);
-  void garbageCollect();
-private:
-  static const jlong serialVersionUID = 4755994433709540381LL;
-public: // actually package-private
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
-private:
-  jint count;
-public: // actually package-private
-  ::java::util::Vector * marks;
-private:
-  static JArray< jchar > * EMPTY;
-public: // actually package-private
-  ::java::lang::ref::ReferenceQueue * queueOfDeath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent__
diff --git a/libjava/javax/swing/text/Style.h b/libjava/javax/swing/text/Style.h
deleted file mode 100644
index ceb4aff7167..00000000000
--- a/libjava/javax/swing/text/Style.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Style__
-#define __javax_swing_text_Style__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Style;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Style : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void addAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual void removeAttribute(::java::lang::Object *) = 0;
-  virtual void removeAttributes(::java::util::Enumeration *) = 0;
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *) = 0;
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
-  virtual jint getAttributeCount() = 0;
-  virtual ::java::util::Enumeration * getAttributeNames() = 0;
-  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
-  virtual jboolean isDefined(::java::lang::Object *) = 0;
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Style__
diff --git a/libjava/javax/swing/text/StyleConstants$CharacterConstants.h b/libjava/javax/swing/text/StyleConstants$CharacterConstants.h
deleted file mode 100644
index c9c84da1886..00000000000
--- a/libjava/javax/swing/text/StyleConstants$CharacterConstants.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants$CharacterConstants__
-#define __javax_swing_text_StyleConstants$CharacterConstants__
-
-#pragma interface
-
-#include <javax/swing/text/StyleConstants.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleConstants$CharacterConstants;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants$CharacterConstants : public ::javax::swing::text::StyleConstants
-{
-
-  StyleConstants$CharacterConstants(::java::lang::String *);
-public:
-  static ::java::lang::Object * Background;
-  static ::java::lang::Object * BidiLevel;
-  static ::java::lang::Object * Bold;
-  static ::java::lang::Object * ComponentAttribute;
-  static ::java::lang::Object * Family;
-  static ::java::lang::Object * Size;
-  static ::java::lang::Object * Foreground;
-  static ::java::lang::Object * IconAttribute;
-  static ::java::lang::Object * Italic;
-  static ::java::lang::Object * StrikeThrough;
-  static ::java::lang::Object * Subscript;
-  static ::java::lang::Object * Superscript;
-  static ::java::lang::Object * Underline;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants$CharacterConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$ColorConstants.h b/libjava/javax/swing/text/StyleConstants$ColorConstants.h
deleted file mode 100644
index 31f2e67fa38..00000000000
--- a/libjava/javax/swing/text/StyleConstants$ColorConstants.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants$ColorConstants__
-#define __javax_swing_text_StyleConstants$ColorConstants__
-
-#pragma interface
-
-#include <javax/swing/text/StyleConstants.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleConstants$ColorConstants;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants$ColorConstants : public ::javax::swing::text::StyleConstants
-{
-
-  StyleConstants$ColorConstants(::java::lang::String *);
-public:
-  static ::java::lang::Object * Foreground;
-  static ::java::lang::Object * Background;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants$ColorConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$FontConstants.h b/libjava/javax/swing/text/StyleConstants$FontConstants.h
deleted file mode 100644
index f2ae13ca6da..00000000000
--- a/libjava/javax/swing/text/StyleConstants$FontConstants.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants$FontConstants__
-#define __javax_swing_text_StyleConstants$FontConstants__
-
-#pragma interface
-
-#include <javax/swing/text/StyleConstants.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleConstants$FontConstants;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants$FontConstants : public ::javax::swing::text::StyleConstants
-{
-
-  StyleConstants$FontConstants(::java::lang::String *);
-public:
-  static ::java::lang::Object * Bold;
-  static ::java::lang::Object * Family;
-  static ::java::lang::Object * Italic;
-  static ::java::lang::Object * Size;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants$FontConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h b/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h
deleted file mode 100644
index 41381f8ba59..00000000000
--- a/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants$ParagraphConstants__
-#define __javax_swing_text_StyleConstants$ParagraphConstants__
-
-#pragma interface
-
-#include <javax/swing/text/StyleConstants.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleConstants$ParagraphConstants;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants$ParagraphConstants : public ::javax::swing::text::StyleConstants
-{
-
-  StyleConstants$ParagraphConstants(::java::lang::String *);
-public:
-  static ::java::lang::Object * Alignment;
-  static ::java::lang::Object * FirstLineIndent;
-  static ::java::lang::Object * LeftIndent;
-  static ::java::lang::Object * LineSpacing;
-  static ::java::lang::Object * Orientation;
-  static ::java::lang::Object * RightIndent;
-  static ::java::lang::Object * SpaceAbove;
-  static ::java::lang::Object * SpaceBelow;
-  static ::java::lang::Object * TabSet;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants$ParagraphConstants__
diff --git a/libjava/javax/swing/text/StyleConstants.h b/libjava/javax/swing/text/StyleConstants.h
deleted file mode 100644
index 1640d415dc9..00000000000
--- a/libjava/javax/swing/text/StyleConstants.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants__
-#define __javax_swing_text_StyleConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-          class StyleConstants;
-          class TabSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleConstants(::java::lang::String *);
-public:
-  virtual ::java::lang::String * toString();
-  static jint getAlignment(::javax::swing::text::AttributeSet *);
-  static ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
-  static jint getBidiLevel(::javax::swing::text::AttributeSet *);
-  static ::java::awt::Component * getComponent(::javax::swing::text::AttributeSet *);
-  static jfloat getFirstLineIndent(::javax::swing::text::AttributeSet *);
-  static ::java::lang::String * getFontFamily(::javax::swing::text::AttributeSet *);
-  static jint getFontSize(::javax::swing::text::AttributeSet *);
-  static ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
-  static ::javax::swing::Icon * getIcon(::javax::swing::text::AttributeSet *);
-  static jfloat getLeftIndent(::javax::swing::text::AttributeSet *);
-  static jfloat getLineSpacing(::javax::swing::text::AttributeSet *);
-  static jfloat getRightIndent(::javax::swing::text::AttributeSet *);
-  static jfloat getSpaceAbove(::javax::swing::text::AttributeSet *);
-  static jfloat getSpaceBelow(::javax::swing::text::AttributeSet *);
-  static ::javax::swing::text::TabSet * getTabSet(::javax::swing::text::AttributeSet *);
-  static jboolean isBold(::javax::swing::text::AttributeSet *);
-  static jboolean isItalic(::javax::swing::text::AttributeSet *);
-  static jboolean isStrikeThrough(::javax::swing::text::AttributeSet *);
-  static jboolean isSubscript(::javax::swing::text::AttributeSet *);
-  static jboolean isSuperscript(::javax::swing::text::AttributeSet *);
-  static jboolean isUnderline(::javax::swing::text::AttributeSet *);
-  static void setAlignment(::javax::swing::text::MutableAttributeSet *, jint);
-  static void setBackground(::javax::swing::text::MutableAttributeSet *, ::java::awt::Color *);
-  static void setBidiLevel(::javax::swing::text::MutableAttributeSet *, jint);
-  static void setBold(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setComponent(::javax::swing::text::MutableAttributeSet *, ::java::awt::Component *);
-  static void setFirstLineIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setFontFamily(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
-  static void setFontSize(::javax::swing::text::MutableAttributeSet *, jint);
-  static void setForeground(::javax::swing::text::MutableAttributeSet *, ::java::awt::Color *);
-  static void setIcon(::javax::swing::text::MutableAttributeSet *, ::javax::swing::Icon *);
-  static void setItalic(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setLeftIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setLineSpacing(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setRightIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setSpaceAbove(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setSpaceBelow(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setStrikeThrough(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setSubscript(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setSuperscript(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setTabSet(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::TabSet *);
-  static void setUnderline(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static const jint ALIGN_LEFT = 0;
-  static const jint ALIGN_CENTER = 1;
-  static const jint ALIGN_RIGHT = 2;
-  static const jint ALIGN_JUSTIFIED = 3;
-  static ::java::lang::Object * Background;
-  static ::java::lang::Object * BidiLevel;
-  static ::java::lang::Object * Bold;
-  static ::java::lang::Object * ComponentAttribute;
-  static ::java::lang::Object * Family;
-  static ::java::lang::Object * FontFamily;
-  static ::java::lang::Object * FontSize;
-  static ::java::lang::Object * Foreground;
-  static ::java::lang::Object * IconAttribute;
-  static ::java::lang::Object * Italic;
-  static ::java::lang::Object * Size;
-  static ::java::lang::Object * StrikeThrough;
-  static ::java::lang::Object * Subscript;
-  static ::java::lang::Object * Superscript;
-  static ::java::lang::Object * Underline;
-  static ::java::lang::Object * Alignment;
-  static ::java::lang::Object * FirstLineIndent;
-  static ::java::lang::Object * LeftIndent;
-  static ::java::lang::Object * LineSpacing;
-  static ::java::lang::Object * Orientation;
-  static ::java::lang::Object * RightIndent;
-  static ::java::lang::Object * SpaceAbove;
-  static ::java::lang::Object * SpaceBelow;
-  static ::java::lang::Object * TabSet;
-  static ::java::lang::String * ComponentElementName;
-  static ::java::lang::String * IconElementName;
-  static ::java::lang::Object * ComposedTextAttribute;
-  static ::java::lang::Object * ModelAttribute;
-  static ::java::lang::Object * NameAttribute;
-  static ::java::lang::Object * ResolveAttribute;
-public: // actually package-private
-  static ::java::util::ArrayList * keys;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyname;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants__
diff --git a/libjava/javax/swing/text/StyleContext$1.h b/libjava/javax/swing/text/StyleContext$1.h
deleted file mode 100644
index b3a20f9b74c..00000000000
--- a/libjava/javax/swing/text/StyleContext$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext$1__
-#define __javax_swing_text_StyleContext$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleContext$1;
-          class StyleContext$SmallAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleContext$1(::javax::swing::text::StyleContext$SmallAttributeSet *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
-  ::javax::swing::text::StyleContext$SmallAttributeSet * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext$1__
diff --git a/libjava/javax/swing/text/StyleContext$NamedStyle.h b/libjava/javax/swing/text/StyleContext$NamedStyle.h
deleted file mode 100644
index 6976975a7f0..00000000000
--- a/libjava/javax/swing/text/StyleContext$NamedStyle.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext$NamedStyle__
-#define __javax_swing_text_StyleContext$NamedStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Style;
-          class StyleContext;
-          class StyleContext$NamedStyle;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext$NamedStyle : public ::java::lang::Object
-{
-
-public:
-  StyleContext$NamedStyle(::javax::swing::text::StyleContext *);
-  StyleContext$NamedStyle(::javax::swing::text::StyleContext *, ::javax::swing::text::Style *);
-  StyleContext$NamedStyle(::javax::swing::text::StyleContext *, ::java::lang::String *, ::javax::swing::text::Style *);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual void addAttributes(::javax::swing::text::AttributeSet *);
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-  virtual void removeAttribute(::java::lang::Object *);
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttributes(::java::util::Enumeration *);
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -6690628971806226374LL;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  ::javax::swing::text::AttributeSet * attributes;
-public: // actually package-private
-  ::javax::swing::text::StyleContext * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext$NamedStyle__
diff --git a/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h b/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h
deleted file mode 100644
index a901647afde..00000000000
--- a/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext$SimpleFontSpec__
-#define __javax_swing_text_StyleContext$SimpleFontSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleContext$SimpleFontSpec;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext$SimpleFontSpec : public ::java::lang::Object
-{
-
-public:
-  StyleContext$SimpleFontSpec(::java::lang::String *, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) family;
-  jint style;
-  jint size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext$SimpleFontSpec__
diff --git a/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h b/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h
deleted file mode 100644
index c4f969c1f0e..00000000000
--- a/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext$SmallAttributeSet__
-#define __javax_swing_text_StyleContext$SmallAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class StyleContext;
-          class StyleContext$SmallAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext$SmallAttributeSet : public ::java::lang::Object
-{
-
-public:
-  StyleContext$SmallAttributeSet(::javax::swing::text::StyleContext *, ::javax::swing::text::AttributeSet *);
-  StyleContext$SmallAttributeSet(::javax::swing::text::StyleContext *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual jint hashCode();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrs;
-private:
-  ::javax::swing::text::AttributeSet * resolveParent;
-public: // actually package-private
-  ::javax::swing::text::StyleContext * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext$SmallAttributeSet__
diff --git a/libjava/javax/swing/text/StyleContext.h b/libjava/javax/swing/text/StyleContext.h
deleted file mode 100644
index c8f91994ee8..00000000000
--- a/libjava/javax/swing/text/StyleContext.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext__
-#define __javax_swing_text_StyleContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-          class Style;
-          class StyleContext;
-          class StyleContext$NamedStyle;
-          class StyleContext$SmallAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext : public ::java::lang::Object
-{
-
-public:
-  StyleContext();
-public: // actually protected
-  virtual ::javax::swing::text::StyleContext$SmallAttributeSet * createSmallAttributeSet(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::MutableAttributeSet * createLargeAttributeSet(::javax::swing::text::AttributeSet *);
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
-  virtual void removeStyle(::java::lang::String *);
-  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
-  virtual ::java::util::Enumeration * getStyleNames();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
-  virtual ::java::awt::Font * getFont(::java::lang::String *, jint, jint);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
-  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
-public: // actually protected
-  virtual jint getCompressionThreshold();
-public:
-  static ::javax::swing::text::StyleContext * getDefaultStyleContext();
-  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * getEmptySet();
-  virtual void reclaim(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *);
-  static ::java::lang::Object * getStaticAttribute(::java::lang::Object *);
-  static ::java::lang::Object * getStaticAttributeKey(::java::lang::Object *);
-  static void readAttributeSet(::java::io::ObjectInputStream *, ::javax::swing::text::MutableAttributeSet *);
-  static void writeAttributeSet(::java::io::ObjectOutputStream *, ::javax::swing::text::AttributeSet *);
-  virtual void readAttributes(::java::io::ObjectInputStream *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void writeAttributes(::java::io::ObjectOutputStream *, ::javax::swing::text::AttributeSet *);
-  static void registerStaticAttributeKey(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::swing::text::AttributeSet * searchImmutableSet();
-  void cleanupPool();
-  ::javax::swing::text::MutableAttributeSet * getMutableAttributeSet(::javax::swing::text::AttributeSet *);
-  static const jlong serialVersionUID = 8042858831190784241LL;
-public:
-  static ::java::lang::String * DEFAULT_STYLE;
-public: // actually package-private
-  static ::java::util::Hashtable * sharedAttributeSets;
-  static ::java::util::Hashtable * sharedFonts;
-  static ::javax::swing::text::StyleContext * defaultStyleContext;
-  static const jint compressionThreshold = 9;
-private:
-  static ::java::util::Hashtable * writeAttributeKeys;
-  static ::java::util::Hashtable * readAttributeKeys;
-  ::javax::swing::text::StyleContext$NamedStyle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) styles;
-  ::javax::swing::text::MutableAttributeSet * search;
-  ::java::util::Map * attributeSetPool;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext__
diff --git a/libjava/javax/swing/text/StyledDocument.h b/libjava/javax/swing/text/StyledDocument.h
deleted file mode 100644
index 2eb580ec2be..00000000000
--- a/libjava/javax/swing/text/StyledDocument.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledDocument__
-#define __javax_swing_text_StyledDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentListener;
-          class UndoableEditListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class Position;
-          class Segment;
-          class Style;
-          class StyledDocument;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledDocument : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *) = 0;
-  virtual void removeStyle(::java::lang::String *) = 0;
-  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *) = 0;
-  virtual void setCharacterAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean) = 0;
-  virtual void setParagraphAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean) = 0;
-  virtual ::javax::swing::text::Style * getLogicalStyle(jint) = 0;
-  virtual void setLogicalStyle(jint, ::javax::swing::text::Style *) = 0;
-  virtual ::javax::swing::text::Element * getParagraphElement(jint) = 0;
-  virtual ::javax::swing::text::Element * getCharacterElement(jint) = 0;
-  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *) = 0;
-  virtual void addDocumentListener(::javax::swing::event::DocumentListener *) = 0;
-  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
-  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
-  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
-  virtual ::javax::swing::text::Position * getEndPosition() = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::Object *) = 0;
-  virtual JArray< ::javax::swing::text::Element * > * getRootElements() = 0;
-  virtual ::javax::swing::text::Position * getStartPosition() = 0;
-  virtual ::java::lang::String * getText(jint, jint) = 0;
-  virtual void getText(jint, jint, ::javax::swing::text::Segment *) = 0;
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void remove(jint, jint) = 0;
-  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *) = 0;
-  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
-  virtual void render(::java::lang::Runnable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_StyledDocument__
diff --git a/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h b/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h
deleted file mode 100644
index 5056840d48f..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$AlignmentAction__
-#define __javax_swing_text_StyledEditorKit$AlignmentAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$AlignmentAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$AlignmentAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$AlignmentAction(::java::lang::String *, jint);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) a;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$AlignmentAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$BoldAction.h b/libjava/javax/swing/text/StyledEditorKit$BoldAction.h
deleted file mode 100644
index 53f1d4ce794..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$BoldAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$BoldAction__
-#define __javax_swing_text_StyledEditorKit$BoldAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$BoldAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$BoldAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$BoldAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$BoldAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h b/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h
deleted file mode 100644
index bda26b61b6a..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$CaretTracker__
-#define __javax_swing_text_StyledEditorKit$CaretTracker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class CaretEvent;
-      }
-      namespace text
-      {
-          class StyledEditorKit;
-          class StyledEditorKit$CaretTracker;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$CaretTracker : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyledEditorKit$CaretTracker(::javax::swing::text::StyledEditorKit *);
-public:
-  virtual void caretUpdate(::javax::swing::event::CaretEvent *);
-public: // actually package-private
-  ::javax::swing::text::StyledEditorKit * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$CaretTracker__
diff --git a/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h b/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h
deleted file mode 100644
index 55ba1378478..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$FontFamilyAction__
-#define __javax_swing_text_StyledEditorKit$FontFamilyAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$FontFamilyAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$FontFamilyAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$FontFamilyAction(::java::lang::String *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) family;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$FontFamilyAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h b/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h
deleted file mode 100644
index 16d6cf3c854..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$FontSizeAction__
-#define __javax_swing_text_StyledEditorKit$FontSizeAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$FontSizeAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$FontSizeAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$FontSizeAction(::java::lang::String *, jint);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$FontSizeAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h b/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h
deleted file mode 100644
index 7b71ef5705e..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$ForegroundAction__
-#define __javax_swing_text_StyledEditorKit$ForegroundAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$ForegroundAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$ForegroundAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$ForegroundAction(::java::lang::String *, ::java::awt::Color *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) fg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$ForegroundAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h b/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h
deleted file mode 100644
index af60f01d3c6..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$ItalicAction__
-#define __javax_swing_text_StyledEditorKit$ItalicAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$ItalicAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$ItalicAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$ItalicAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$ItalicAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h b/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h
deleted file mode 100644
index c85bc8c8926..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$StyledTextAction__
-#define __javax_swing_text_StyledEditorKit$StyledTextAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace text
-      {
-          class AttributeSet;
-          class StyledDocument;
-          class StyledEditorKit;
-          class StyledEditorKit$StyledTextAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$StyledTextAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  StyledEditorKit$StyledTextAction(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::JEditorPane * getEditor(::java::awt::event::ActionEvent *);
-  virtual void setCharacterAttributes(::javax::swing::JEditorPane *, ::javax::swing::text::AttributeSet *, jboolean);
-  virtual ::javax::swing::text::StyledDocument * getStyledDocument(::javax::swing::JEditorPane *);
-  virtual ::javax::swing::text::StyledEditorKit * getStyledEditorKit(::javax::swing::JEditorPane *);
-  virtual void setParagraphAttributes(::javax::swing::JEditorPane *, ::javax::swing::text::AttributeSet *, jboolean);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$StyledTextAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h b/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h
deleted file mode 100644
index 0e5ad47a9d0..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$StyledViewFactory__
-#define __javax_swing_text_StyledEditorKit$StyledViewFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class StyledEditorKit$StyledViewFactory;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$StyledViewFactory : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyledEditorKit$StyledViewFactory();
-public:
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$StyledViewFactory__
diff --git a/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h b/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h
deleted file mode 100644
index 4df2fa6d1c1..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$UnderlineAction__
-#define __javax_swing_text_StyledEditorKit$UnderlineAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$UnderlineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$UnderlineAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$UnderlineAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$UnderlineAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit.h b/libjava/javax/swing/text/StyledEditorKit.h
deleted file mode 100644
index e5ce1b4b4fa..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit__
-#define __javax_swing_text_StyledEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultEditorKit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JEditorPane;
-      namespace text
-      {
-          class Document;
-          class Element;
-          class MutableAttributeSet;
-          class StyledEditorKit;
-          class StyledEditorKit$CaretTracker;
-          class StyledEditorKit$StyledViewFactory;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit : public ::javax::swing::text::DefaultEditorKit
-{
-
-public:
-  StyledEditorKit();
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
-  virtual ::javax::swing::text::Element * getCharacterAttributeRun();
-  virtual ::javax::swing::text::Document * createDefaultDocument();
-  virtual void install(::javax::swing::JEditorPane *);
-  virtual void deinstall(::javax::swing::JEditorPane *);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-public: // actually protected
-  virtual void createInputAttributes(::javax::swing::text::Element *, ::javax::swing::text::MutableAttributeSet *);
-private:
-  static const jlong serialVersionUID = 7002391892985555948LL;
-public: // actually package-private
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultEditorKit)))) currentRun;
-  ::javax::swing::text::MutableAttributeSet * inputAttributes;
-  ::javax::swing::text::StyledEditorKit$CaretTracker * caretTracker;
-  ::javax::swing::text::StyledEditorKit$StyledViewFactory * viewFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit__
diff --git a/libjava/javax/swing/text/TabExpander.h b/libjava/javax/swing/text/TabExpander.h
deleted file mode 100644
index 8983223a436..00000000000
--- a/libjava/javax/swing/text/TabExpander.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TabExpander__
-#define __javax_swing_text_TabExpander__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class TabExpander;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TabExpander : public ::java::lang::Object
-{
-
-public:
-  virtual jfloat nextTabStop(jfloat, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_TabExpander__
diff --git a/libjava/javax/swing/text/TabSet.h b/libjava/javax/swing/text/TabSet.h
deleted file mode 100644
index 943a115099e..00000000000
--- a/libjava/javax/swing/text/TabSet.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TabSet__
-#define __javax_swing_text_TabSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class TabSet;
-          class TabStop;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TabSet : public ::java::lang::Object
-{
-
-public:
-  TabSet(JArray< ::javax::swing::text::TabStop * > *);
-  virtual ::javax::swing::text::TabStop * getTab(jint);
-  virtual ::javax::swing::text::TabStop * getTabAfter(jfloat);
-  virtual jint getTabCount();
-  virtual jint getTabIndex(::javax::swing::text::TabStop *);
-  virtual jint getTabIndexAfter(jfloat);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 2367703481999080593LL;
-public: // actually package-private
-  JArray< ::javax::swing::text::TabStop * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tabs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TabSet__
diff --git a/libjava/javax/swing/text/TabStop.h b/libjava/javax/swing/text/TabStop.h
deleted file mode 100644
index cc8fb1232ff..00000000000
--- a/libjava/javax/swing/text/TabStop.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TabStop__
-#define __javax_swing_text_TabStop__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class TabStop;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TabStop : public ::java::lang::Object
-{
-
-public:
-  TabStop(jfloat);
-  TabStop(jfloat, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint getAlignment();
-  virtual jint getLeader();
-  virtual jfloat getPosition();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5381995917363605058LL;
-public:
-  static const jint ALIGN_LEFT = 0;
-  static const jint ALIGN_RIGHT = 1;
-  static const jint ALIGN_CENTER = 2;
-  static const jint ALIGN_DECIMAL = 4;
-  static const jint ALIGN_BAR = 5;
-  static const jint LEAD_NONE = 0;
-  static const jint LEAD_DOTS = 1;
-  static const jint LEAD_HYPHENS = 2;
-  static const jint LEAD_UNDERLINE = 3;
-  static const jint LEAD_THICKLINE = 4;
-  static const jint LEAD_EQUALS = 5;
-public: // actually package-private
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos;
-  jint align;
-  jint leader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TabStop__
diff --git a/libjava/javax/swing/text/TabableView.h b/libjava/javax/swing/text/TabableView.h
deleted file mode 100644
index b9e9a7a86f0..00000000000
--- a/libjava/javax/swing/text/TabableView.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TabableView__
-#define __javax_swing_text_TabableView__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class TabExpander;
-          class TabableView;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TabableView : public ::java::lang::Object
-{
-
-public:
-  virtual jfloat getPartialSpan(jint, jint) = 0;
-  virtual jfloat getTabbedSpan(jfloat, ::javax::swing::text::TabExpander *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_TabableView__
diff --git a/libjava/javax/swing/text/TableView$TableCell.h b/libjava/javax/swing/text/TableView$TableCell.h
deleted file mode 100644
index 44efc2f6c9b..00000000000
--- a/libjava/javax/swing/text/TableView$TableCell.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TableView$TableCell__
-#define __javax_swing_text_TableView$TableCell__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class TableView;
-          class TableView$TableCell;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TableView$TableCell : public ::javax::swing::text::BoxView
-{
-
-public:
-  TableView$TableCell(::javax::swing::text::TableView *, ::javax::swing::text::Element *);
-  virtual jint getColumnCount();
-  virtual jint getRowCount();
-  virtual void setGridLocation(jint, jint);
-  virtual jint getGridRow();
-  virtual jint getGridColumn();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) row;
-  jint column;
-public: // actually package-private
-  ::javax::swing::text::TableView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TableView$TableCell__
diff --git a/libjava/javax/swing/text/TableView$TableRow.h b/libjava/javax/swing/text/TableView$TableRow.h
deleted file mode 100644
index 0cb23241da4..00000000000
--- a/libjava/javax/swing/text/TableView$TableRow.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TableView$TableRow__
-#define __javax_swing_text_TableView$TableRow__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class TableView;
-          class TableView$TableRow;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TableView$TableRow : public ::javax::swing::text::BoxView
-{
-
-public:
-  TableView$TableRow(::javax::swing::text::TableView *, ::javax::swing::text::Element *);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-public: // actually protected
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-public:
-  virtual jint getResizeWeight(jint);
-public: // actually protected
-  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
-public: // actually package-private
-  ::javax::swing::text::TableView * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TableView$TableRow__
diff --git a/libjava/javax/swing/text/TableView.h b/libjava/javax/swing/text/TableView.h
deleted file mode 100644
index 7bf5f836976..00000000000
--- a/libjava/javax/swing/text/TableView.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TableView__
-#define __javax_swing_text_TableView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class Element;
-          class TableView;
-          class TableView$TableCell;
-          class TableView$TableRow;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TableView : public ::javax::swing::text::BoxView
-{
-
-public:
-  TableView(::javax::swing::text::Element *);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-public: // actually protected
-  virtual ::javax::swing::text::TableView$TableRow * createTableRow(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::TableView$TableCell * createTableCell(::javax::swing::text::Element *);
-  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void layoutColumns(jint, JArray< jint > *, JArray< jint > *, JArray< ::javax::swing::SizeRequirements * > *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
-private:
-  void updateColumnRequirements();
-public: // actually package-private
-  JArray< jint > * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) columnOffsets;
-  JArray< jint > * columnSpans;
-  JArray< ::javax::swing::SizeRequirements * > * columnRequirements;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TableView__
diff --git a/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h b/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h
deleted file mode 100644
index 93bf43700bb..00000000000
--- a/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TextAction$HorizontalMovementAction__
-#define __javax_swing_text_TextAction$HorizontalMovementAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class TextAction$HorizontalMovementAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TextAction$HorizontalMovementAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  TextAction$HorizontalMovementAction(::java::lang::String *, jint);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint) = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::TextAction)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TextAction$HorizontalMovementAction__
diff --git a/libjava/javax/swing/text/TextAction$VerticalMovementAction.h b/libjava/javax/swing/text/TextAction$VerticalMovementAction.h
deleted file mode 100644
index b25ec52ce8a..00000000000
--- a/libjava/javax/swing/text/TextAction$VerticalMovementAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TextAction$VerticalMovementAction__
-#define __javax_swing_text_TextAction$VerticalMovementAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class TextAction$VerticalMovementAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TextAction$VerticalMovementAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  TextAction$VerticalMovementAction(::java::lang::String *, jint);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint) = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::TextAction)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TextAction$VerticalMovementAction__
diff --git a/libjava/javax/swing/text/TextAction.h b/libjava/javax/swing/text/TextAction.h
deleted file mode 100644
index cfb9c1c9819..00000000000
--- a/libjava/javax/swing/text/TextAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TextAction__
-#define __javax_swing_text_TextAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace text
-      {
-          class JTextComponent;
-          class TextAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TextAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  TextAction(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::text::JTextComponent * getTextComponent(::java::awt::event::ActionEvent *);
-public:
-  static JArray< ::javax::swing::Action * > * augmentList(JArray< ::javax::swing::Action * > *, JArray< ::javax::swing::Action * > *);
-public: // actually protected
-  virtual ::javax::swing::text::JTextComponent * getFocusedComponent();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TextAction__
diff --git a/libjava/javax/swing/text/Utilities.h b/libjava/javax/swing/text/Utilities.h
deleted file mode 100644
index ec04c43fe38..00000000000
--- a/libjava/javax/swing/text/Utilities.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Utilities__
-#define __javax_swing_text_Utilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class FontMetrics;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class JTextComponent;
-          class Segment;
-          class TabExpander;
-          class Utilities;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Utilities : public ::java::lang::Object
-{
-
-public:
-  Utilities();
-  static jint drawTabbedText(::javax::swing::text::Segment *, jint, jint, ::java::awt::Graphics *, ::javax::swing::text::TabExpander *, jint);
-  static jint getTabbedTextWidth(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, ::javax::swing::text::TabExpander *, jint);
-  static jint getTabbedTextOffset(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint, jboolean);
-  static jint getTabbedTextOffset(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint);
-  static jint getNextWord(::javax::swing::text::JTextComponent *, jint);
-  static jint getPreviousWord(::javax::swing::text::JTextComponent *, jint);
-  static jint getWordStart(::javax::swing::text::JTextComponent *, jint);
-  static jint getWordEnd(::javax::swing::text::JTextComponent *, jint);
-  static jint getRowEnd(::javax::swing::text::JTextComponent *, jint);
-  static jint getRowStart(::javax::swing::text::JTextComponent *, jint);
-  static jint getBreakLocation(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint);
-  static ::javax::swing::text::Element * getParagraphElement(::javax::swing::text::JTextComponent *, jint);
-  static jint getPositionAbove(::javax::swing::text::JTextComponent *, jint, jint);
-  static jint getPositionBelow(::javax::swing::text::JTextComponent *, jint, jint);
-public: // actually package-private
-  static jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_Utilities__
diff --git a/libjava/javax/swing/text/View.h b/libjava/javax/swing/text/View.h
deleted file mode 100644
index f9d97e5731f..00000000000
--- a/libjava/javax/swing/text/View.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_View__
-#define __javax_swing_text_View__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class Element;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::View : public ::java::lang::Object
-{
-
-public:
-  View(::javax::swing::text::Element *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *) = 0;
-  virtual void setParent(::javax::swing::text::View *);
-  virtual ::javax::swing::text::View * getParent();
-  virtual ::java::awt::Container * getContainer();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::swing::text::Element * getElement();
-  virtual jfloat getPreferredSpan(jint) = 0;
-  virtual jint getResizeWeight(jint);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual void setSize(jfloat, jfloat);
-  virtual jfloat getAlignment(jint);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jboolean isVisible();
-  virtual jint getViewCount();
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual void insert(jint, ::javax::swing::text::View *);
-  virtual void append(::javax::swing::text::View *);
-  virtual void removeAll();
-  virtual void remove(jint);
-  virtual ::javax::swing::text::View * createFragment(jint, jint);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-  virtual jint getViewIndex(jfloat, jfloat, ::java::awt::Shape *);
-  virtual ::java::lang::String * getToolTipText(jfloat, jfloat, ::java::awt::Shape *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
-  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual jboolean updateChildren(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::javax::swing::text::ViewFactory *);
-  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void forwardUpdateToView(::javax::swing::text::View *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void updateLayout(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
-public:
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *) = 0;
-  virtual ::java::awt::Shape * modelToView(jint, ::javax::swing::text::Position$Bias *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *);
-public: // actually protected
-  virtual void dump();
-public: // actually package-private
-  virtual void dump(jint);
-public:
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  static const jint BadBreakWeight = 0;
-  static const jint ExcellentBreakWeight = 2000;
-  static const jint ForcedBreakWeight = 3000;
-  static const jint GoodBreakWeight = 1000;
-  static const jint X_AXIS = 0;
-  static const jint Y_AXIS = 1;
-private:
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elt;
-  ::javax::swing::text::View * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_View__
diff --git a/libjava/javax/swing/text/ViewFactory.h b/libjava/javax/swing/text/ViewFactory.h
deleted file mode 100644
index a65181ab288..00000000000
--- a/libjava/javax/swing/text/ViewFactory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ViewFactory__
-#define __javax_swing_text_ViewFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ViewFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_ViewFactory__
diff --git a/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h b/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h
deleted file mode 100644
index c96da223418..00000000000
--- a/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_WrappedPlainView$WrappedLine__
-#define __javax_swing_text_WrappedPlainView$WrappedLine__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class Position$Bias;
-          class ViewFactory;
-          class WrappedPlainView;
-          class WrappedPlainView$WrappedLine;
-      }
-    }
-  }
-}
-
-class javax::swing::text::WrappedPlainView$WrappedLine : public ::javax::swing::text::View
-{
-
-public:
-  WrappedPlainView$WrappedLine(::javax::swing::text::WrappedPlainView *, ::javax::swing::text::Element *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-private:
-  jint determineNumLines();
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually package-private
-  virtual void updateDamage(::java::awt::Rectangle *);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) numLines;
-  ::javax::swing::text::WrappedPlainView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_WrappedPlainView$WrappedLine__
diff --git a/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h b/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h
deleted file mode 100644
index eb249a0c0c6..00000000000
--- a/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_WrappedPlainView$WrappedLineCreator__
-#define __javax_swing_text_WrappedPlainView$WrappedLineCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class View;
-          class WrappedPlainView;
-          class WrappedPlainView$WrappedLineCreator;
-      }
-    }
-  }
-}
-
-class javax::swing::text::WrappedPlainView$WrappedLineCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  WrappedPlainView$WrappedLineCreator(::javax::swing::text::WrappedPlainView *);
-public:
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-public: // actually package-private
-  ::javax::swing::text::WrappedPlainView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_WrappedPlainView$WrappedLineCreator__
diff --git a/libjava/javax/swing/text/WrappedPlainView.h b/libjava/javax/swing/text/WrappedPlainView.h
deleted file mode 100644
index 1082073cc34..00000000000
--- a/libjava/javax/swing/text/WrappedPlainView.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_WrappedPlainView__
-#define __javax_swing_text_WrappedPlainView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class FontMetrics;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class Segment;
-          class ViewFactory;
-          class WrappedPlainView;
-      }
-    }
-  }
-}
-
-class javax::swing::text::WrappedPlainView : public ::javax::swing::text::BoxView
-{
-
-public:
-  WrappedPlainView(::javax::swing::text::Element *);
-  WrappedPlainView(::javax::swing::text::Element *, jboolean);
-public: // actually protected
-  virtual ::javax::swing::text::Segment * getLineBuffer();
-public:
-  virtual jfloat nextTabStop(jfloat, jint);
-public: // actually protected
-  virtual jint getTabSize();
-  virtual void drawLine(jint, jint, ::java::awt::Graphics *, jint, jint);
-  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual jint calculateBreakPosition(jint, jint);
-public: // actually package-private
-  virtual void updateMetrics();
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-private:
-  void updateChildren(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual void setSize(jfloat, jfloat);
-public: // actually package-private
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) selectedColor;
-  ::java::awt::Color * unselectedColor;
-  ::java::awt::Color * disabledColor;
-  ::java::awt::FontMetrics * metrics;
-  jboolean wordWrap;
-  ::javax::swing::text::ViewFactory * viewFactory;
-  jint selectionStart;
-  jint selectionEnd;
-  jint lineHeight;
-private:
-  jint tabBase;
-  jint tabSize;
-  ::javax::swing::text::Segment * lineBuffer;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_WrappedPlainView__
diff --git a/libjava/javax/swing/text/ZoneView$Zone.h b/libjava/javax/swing/text/ZoneView$Zone.h
deleted file mode 100644
index 86a5bc87c12..00000000000
--- a/libjava/javax/swing/text/ZoneView$Zone.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ZoneView$Zone__
-#define __javax_swing_text_ZoneView$Zone__
-
-#pragma interface
-
-#include <javax/swing/text/AsyncBoxView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class Position;
-          class ZoneView$Zone;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ZoneView$Zone : public ::javax::swing::text::AsyncBoxView
-{
-
-public: // actually package-private
-  ZoneView$Zone(::javax::swing::text::Element *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, jint);
-public:
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-private:
-  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::javax::swing::text::AsyncBoxView)))) p0;
-  ::javax::swing::text::Position * p1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ZoneView$Zone__
diff --git a/libjava/javax/swing/text/ZoneView.h b/libjava/javax/swing/text/ZoneView.h
deleted file mode 100644
index 324d90c0a33..00000000000
--- a/libjava/javax/swing/text/ZoneView.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ZoneView__
-#define __javax_swing_text_ZoneView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class Element;
-          class View;
-          class ViewFactory;
-          class ZoneView;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ZoneView : public ::javax::swing::text::BoxView
-{
-
-public:
-  ZoneView(::javax::swing::text::Element *, jint);
-  virtual void setMaximumZoneSize(jint);
-  virtual jint getMaximumZoneSize();
-  virtual void setMaxZonesLoaded(jint);
-  virtual jint getMaxZonesLoaded();
-public: // actually protected
-  virtual void zoneWasLoaded(::javax::swing::text::View *);
-  virtual void unloadZone(::javax::swing::text::View *);
-  virtual jboolean isZoneLoaded(::javax::swing::text::View *);
-  virtual ::javax::swing::text::View * createZone(jint, jint);
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual jint getViewIndexAtPosition(jint);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual jboolean updateChildren(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::javax::swing::text::ViewFactory *);
-private:
-  void unloadOldestZones();
-  void checkZoneAt(jint);
-  void splitZone(jint, jint, jint);
-  jint getPreferredZoneEnd(jint);
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) maximumZoneSize;
-  jint maxZonesLoaded;
-  ::java::util::LinkedList * loadedZones;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ZoneView__
diff --git a/libjava/javax/swing/text/html/BRView.h b/libjava/javax/swing/text/html/BRView.h
deleted file mode 100644
index aee03f09e05..00000000000
--- a/libjava/javax/swing/text/html/BRView.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_BRView__
-#define __javax_swing_text_html_BRView__
-
-#pragma interface
-
-#include <javax/swing/text/html/InlineView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class BRView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::BRView : public ::javax::swing::text::html::InlineView
-{
-
-public:
-  BRView(::javax::swing::text::Element *);
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_BRView__
diff --git a/libjava/javax/swing/text/html/BlockView$PositionInfo.h b/libjava/javax/swing/text/html/BlockView$PositionInfo.h
deleted file mode 100644
index 1e19b610fd4..00000000000
--- a/libjava/javax/swing/text/html/BlockView$PositionInfo.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_BlockView$PositionInfo__
-#define __javax_swing_text_html_BlockView$PositionInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class BlockView$PositionInfo;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::BlockView$PositionInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BlockView$PositionInfo(jint, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *);
-  static const jint STATIC = 0;
-  static const jint RELATIVE = 1;
-  static const jint ABSOLUTE = 2;
-  static const jint FIXED = 3;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::gnu::javax::swing::text::html::css::Length * left;
-  ::gnu::javax::swing::text::html::css::Length * right;
-  ::gnu::javax::swing::text::html::css::Length * top;
-  ::gnu::javax::swing::text::html::css::Length * bottom;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_BlockView$PositionInfo__
diff --git a/libjava/javax/swing/text/html/BlockView.h b/libjava/javax/swing/text/html/BlockView.h
deleted file mode 100644
index b8608f5c001..00000000000
--- a/libjava/javax/swing/text/html/BlockView.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_BlockView__
-#define __javax_swing_text_html_BlockView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class View;
-          class ViewFactory;
-        namespace html
-        {
-            class BlockView;
-            class StyleSheet;
-            class StyleSheet$BoxPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::BlockView : public ::javax::swing::text::BoxView
-{
-
-public:
-  BlockView(::javax::swing::text::Element *, jint);
-  virtual void setParent(::javax::swing::text::View *);
-public: // actually protected
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-private:
-  jboolean setCSSSpan(::javax::swing::SizeRequirements *, jint);
-  void constrainSize(jint, ::javax::swing::SizeRequirements *, ::javax::swing::SizeRequirements *);
-public: // actually protected
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-private:
-  void positionView(jint, jint, jint, JArray< jint > *, JArray< jint > *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jint getResizeWeight(jint);
-  virtual jfloat getAlignment(jint);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-public:
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-private:
-  void fetchLayoutInfo(::javax::swing::text::View *);
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) attributes;
-public: // actually package-private
-  ::javax::swing::text::html::StyleSheet$BoxPainter * painter;
-private:
-  JArray< ::gnu::javax::swing::text::html::css::Length * > * cssSpans;
-  ::java::util::HashMap * positionInfo;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_BlockView__
diff --git a/libjava/javax/swing/text/html/CSS$Attribute.h b/libjava/javax/swing/text/html/CSS$Attribute.h
deleted file mode 100644
index 44c82500b25..00000000000
--- a/libjava/javax/swing/text/html/CSS$Attribute.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSS$Attribute__
-#define __javax_swing_text_html_CSS$Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class CSS$Attribute;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSS$Attribute : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSS$Attribute(::java::lang::String *, jboolean, ::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-  jboolean isInherited();
-  ::java::lang::String * getDefaultValue();
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_ATTACHMENT;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_IMAGE;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_POSITION;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_REPEAT;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * CLEAR;
-  static ::javax::swing::text::html::CSS$Attribute * COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * DISPLAY;
-  static ::javax::swing::text::html::CSS$Attribute * FLOAT;
-  static ::javax::swing::text::html::CSS$Attribute * FONT;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_FAMILY;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_SIZE;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_VARIANT;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_WEIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * HEIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * LETTER_SPACING;
-  static ::javax::swing::text::html::CSS$Attribute * LINE_HEIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_IMAGE;
-  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_POSITION;
-  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_TYPE;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN_BOTTOM;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN_LEFT;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN_RIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN_TOP;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING_BOTTOM;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING_LEFT;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING_RIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING_TOP;
-  static ::javax::swing::text::html::CSS$Attribute * TEXT_ALIGN;
-  static ::javax::swing::text::html::CSS$Attribute * TEXT_DECORATION;
-  static ::javax::swing::text::html::CSS$Attribute * TEXT_INDENT;
-  static ::javax::swing::text::html::CSS$Attribute * TEXT_TRANSFORM;
-  static ::javax::swing::text::html::CSS$Attribute * VERTICAL_ALIGN;
-  static ::javax::swing::text::html::CSS$Attribute * WHITE_SPACE;
-  static ::javax::swing::text::html::CSS$Attribute * WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * WORD_SPACING;
-public: // actually package-private
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_SPACING;
-  static ::javax::swing::text::html::CSS$Attribute * POSITION;
-  static ::javax::swing::text::html::CSS$Attribute * LEFT;
-  static ::javax::swing::text::html::CSS$Attribute * RIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * TOP;
-  static ::javax::swing::text::html::CSS$Attribute * BOTTOM;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attStr;
-  jboolean isInherited__;
-  ::java::lang::String * defaultValue;
-  static ::java::util::HashMap * attributeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_CSS$Attribute__
diff --git a/libjava/javax/swing/text/html/CSS.h b/libjava/javax/swing/text/html/CSS.h
deleted file mode 100644
index 1f3922db0bb..00000000000
--- a/libjava/javax/swing/text/html/CSS.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSS__
-#define __javax_swing_text_html_CSS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class CSS;
-            class CSS$Attribute;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSS : public ::java::lang::Object
-{
-
-public:
-  CSS();
-  static JArray< ::javax::swing::text::html::CSS$Attribute * > * getAllAttributeKeys();
-  static ::javax::swing::text::html::CSS$Attribute * getAttribute(::java::lang::String *);
-public: // actually package-private
-  static ::java::lang::Object * getValue(::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
-  static void addInternal(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
-private:
-  static void parseBackgroundShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
-  static void parsePaddingShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
-  static void parseMarginShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
-  static void parseBorderShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *, ::javax::swing::text::html::CSS$Attribute *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_CSS__
diff --git a/libjava/javax/swing/text/html/CSSBorder.h b/libjava/javax/swing/text/html/CSSBorder.h
deleted file mode 100644
index aa836ff65e1..00000000000
--- a/libjava/javax/swing/text/html/CSSBorder.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSSBorder__
-#define __javax_swing_text_html_CSSBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class CSS$Attribute;
-            class CSSBorder;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSSBorder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSSBorder(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
-private:
-  jint getBorderStyle(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *);
-  ::java::awt::Color * getBorderColor(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *);
-  jint getBorderWidth(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::javax::swing::text::html::StyleSheet *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  void paintBorderLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintDottedLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintDashedLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintSolidLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintDoubleLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintGrooveLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintRidgeLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintOutsetLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintInsetLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  static const jint STYLE_NOT_SET = -1;
-  static const jint STYLE_NONE = 0;
-  static const jint STYLE_HIDDEN = 1;
-  static const jint STYLE_DOTTED = 2;
-  static const jint STYLE_DASHED = 3;
-  static const jint STYLE_SOLID = 4;
-  static const jint STYLE_DOUBLE = 5;
-  static const jint STYLE_GROOVE = 6;
-  static const jint STYLE_RIDGE = 7;
-  static const jint STYLE_INSET = 8;
-  static const jint STYLE_OUTSET = 9;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
-  jint right;
-  jint top;
-  jint bottom;
-  jint leftStyle;
-  jint rightStyle;
-  jint topStyle;
-  ::java::awt::Color * topColor;
-  ::java::awt::Color * bottomColor;
-  ::java::awt::Color * leftColor;
-  ::java::awt::Color * rightColor;
-  jint bottomStyle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_CSSBorder__
diff --git a/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h b/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h
deleted file mode 100644
index a2bb6622879..00000000000
--- a/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSSParser$CSSParserCallback__
-#define __javax_swing_text_html_CSSParser$CSSParserCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class CSSParser$CSSParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSSParser$CSSParserCallback : public ::java::lang::Object
-{
-
-public:
-  virtual void handleImport(::java::lang::String *) = 0;
-  virtual void startRule() = 0;
-  virtual void endRule() = 0;
-  virtual void handleSelector(::java::lang::String *) = 0;
-  virtual void handleProperty(::java::lang::String *) = 0;
-  virtual void handleValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_html_CSSParser$CSSParserCallback__
diff --git a/libjava/javax/swing/text/html/CSSParser.h b/libjava/javax/swing/text/html/CSSParser.h
deleted file mode 100644
index 83cda4f2dcb..00000000000
--- a/libjava/javax/swing/text/html/CSSParser.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSSParser__
-#define __javax_swing_text_html_CSSParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class CSSParser;
-            class CSSParser$CSSParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSSParser : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSSParser();
-private:
-  void append(jchar);
-  jint nextToken(jchar);
-  jint readChar();
-public: // actually package-private
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::CSSParser$CSSParserCallback *, jboolean);
-private:
-  jint readWS();
-  jboolean getNextStatement();
-  void parseAtRule();
-  void parseRuleSet();
-  jboolean parseSelectors();
-  void parseDeclarationBlock();
-  jint parseDeclaration();
-  jint parseIdentifiers(jchar, jboolean);
-  void parseTillClosed(jint);
-  jboolean getIdentifier(jchar);
-  void readTill(jchar);
-  void readComment();
-  void startBlock(jint);
-  void endBlock(jint);
-  jboolean inBlock();
-  void pushChar(jint);
-  static const jint IDENTIFIER = 1;
-  static const jint BRACKET_OPEN = 2;
-  static const jint BRACKET_CLOSE = 3;
-  static const jint BRACE_OPEN = 4;
-  static const jint BRACE_CLOSE = 5;
-  static const jint PAREN_OPEN = 6;
-  static const jint PAREN_CLOSE = 7;
-  static const jint END = -1;
-  static JArray< jchar > * charMapping;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) didPushChar;
-  jint pushedChar;
-  JArray< jint > * unitStack;
-  jint stackCount;
-  ::java::io::Reader * reader;
-  jboolean encounteredRuleSet;
-  ::javax::swing::text::html::CSSParser$CSSParserCallback * callback;
-  JArray< jchar > * tokenBuffer;
-  jint tokenBufferLength;
-  jboolean readWS__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_CSSParser__
diff --git a/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h b/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h
deleted file mode 100644
index 99fbed04d3e..00000000000
--- a/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormSubmitEvent$MethodType__
-#define __javax_swing_text_html_FormSubmitEvent$MethodType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class FormSubmitEvent$MethodType;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormSubmitEvent$MethodType : public ::java::lang::Object
-{
-
-  FormSubmitEvent$MethodType();
-public:
-  static ::javax::swing::text::html::FormSubmitEvent$MethodType * POST;
-  static ::javax::swing::text::html::FormSubmitEvent$MethodType * GET;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormSubmitEvent$MethodType__
diff --git a/libjava/javax/swing/text/html/FormSubmitEvent.h b/libjava/javax/swing/text/html/FormSubmitEvent.h
deleted file mode 100644
index 7908376d167..00000000000
--- a/libjava/javax/swing/text/html/FormSubmitEvent.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormSubmitEvent__
-#define __javax_swing_text_html_FormSubmitEvent__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLFrameHyperlinkEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent$EventType;
-      }
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class FormSubmitEvent;
-            class FormSubmitEvent$MethodType;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormSubmitEvent : public ::javax::swing::text::html::HTMLFrameHyperlinkEvent
-{
-
-public: // actually package-private
-  FormSubmitEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::FormSubmitEvent$MethodType *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getData();
-  virtual ::javax::swing::text::html::FormSubmitEvent$MethodType * getMethod();
-private:
-  ::javax::swing::text::html::FormSubmitEvent$MethodType * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLFrameHyperlinkEvent)))) method;
-  ::java::lang::String * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormSubmitEvent__
diff --git a/libjava/javax/swing/text/html/FormView$1.h b/libjava/javax/swing/text/html/FormView$1.h
deleted file mode 100644
index 99a5627f15a..00000000000
--- a/libjava/javax/swing/text/html/FormView$1.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormView$1__
-#define __javax_swing_text_html_FormView$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace text
-      {
-        namespace html
-        {
-            class FormView$1;
-            class FormView$SubmitThread;
-            class HTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormView$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FormView$1(::javax::swing::text::html::FormView$SubmitThread *, ::javax::swing::text::html::HTMLDocument *, ::javax::swing::JEditorPane *, ::java::lang::String *, ::java::net::URL *, ::java::lang::String *, ::java::net::URL *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::swing::text::html::FormView$SubmitThread * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::javax::swing::text::html::HTMLDocument * val$doc;
-  ::javax::swing::JEditorPane * val$editor;
-  ::java::lang::String * val$method;
-  ::java::net::URL * val$actionURL;
-  ::java::lang::String * val$target;
-  ::java::net::URL * val$url;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormView$1__
diff --git a/libjava/javax/swing/text/html/FormView$MouseEventListener.h b/libjava/javax/swing/text/html/FormView$MouseEventListener.h
deleted file mode 100644
index d602e6449f3..00000000000
--- a/libjava/javax/swing/text/html/FormView$MouseEventListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormView$MouseEventListener__
-#define __javax_swing_text_html_FormView$MouseEventListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class FormView;
-            class FormView$MouseEventListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormView$MouseEventListener : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  FormView$MouseEventListener(::javax::swing::text::html::FormView *);
-public:
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::text::html::FormView * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormView$MouseEventListener__
diff --git a/libjava/javax/swing/text/html/FormView$SubmitThread.h b/libjava/javax/swing/text/html/FormView$SubmitThread.h
deleted file mode 100644
index 69a01bbe77c..00000000000
--- a/libjava/javax/swing/text/html/FormView$SubmitThread.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormView$SubmitThread__
-#define __javax_swing_text_html_FormView$SubmitThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class FormSubmitEvent;
-            class FormView;
-            class FormView$SubmitThread;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormView$SubmitThread : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  FormView$SubmitThread(::javax::swing::text::html::FormView *, ::java::lang::String *);
-public:
-  virtual void run();
-private:
-  ::java::lang::String * getMethod();
-  ::java::net::URL * getActionURL();
-  ::java::lang::String * getTarget();
-  void postData(::java::net::URLConnection *, ::java::lang::String *);
-  ::javax::swing::text::AttributeSet * getFormAttributes();
-public: // actually package-private
-  virtual ::javax::swing::text::html::FormSubmitEvent * createSubmitEvent(::java::lang::String *, ::java::net::URL *, ::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) data;
-public: // actually package-private
-  ::javax::swing::text::html::FormView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormView$SubmitThread__
diff --git a/libjava/javax/swing/text/html/FormView.h b/libjava/javax/swing/text/html/FormView.h
deleted file mode 100644
index fff2e630988..00000000000
--- a/libjava/javax/swing/text/html/FormView.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormView__
-#define __javax_swing_text_html_FormView__
-
-#pragma interface
-
-#include <javax/swing/text/ComponentView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class FormView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormView : public ::javax::swing::text::ComponentView
-{
-
-public:
-  FormView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::awt::Component * createComponent();
-public:
-  virtual jfloat getMaximumSpan(jint);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  virtual void submitData(::java::lang::String *);
-  virtual void imageSubmit(::java::lang::String *);
-public: // actually package-private
-  virtual ::java::lang::String * getImageData(::java::awt::Point *);
-  virtual ::javax::swing::text::Element * getFormElement();
-private:
-  ::java::lang::String * getFormData();
-  void getElementFormData(::javax::swing::text::Element *, ::java::lang::StringBuilder *);
-  void getSelectData(::javax::swing::text::AttributeSet *, ::java::lang::StringBuilder *);
-  ::java::lang::String * getTextAreaData(::javax::swing::text::AttributeSet *);
-  ::java::lang::String * getInputFormData(::javax::swing::text::AttributeSet *);
-  void addData(::java::lang::StringBuilder *, ::java::lang::String *, ::java::lang::String *);
-  void resetForm();
-public:
-  static ::java::lang::String * SUBMIT;
-  static ::java::lang::String * RESET;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::text::ComponentView)))) maxIsPreferred;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormView__
diff --git a/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h b/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h
deleted file mode 100644
index ae59240acf9..00000000000
--- a/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FrameSetView$FrameSetRow__
-#define __javax_swing_text_html_FrameSetView$FrameSetRow__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class ViewFactory;
-        namespace html
-        {
-            class FrameSetView;
-            class FrameSetView$FrameSetRow;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FrameSetView$FrameSetRow : public ::javax::swing::text::BoxView
-{
-
-public: // actually package-private
-  FrameSetView$FrameSetRow(::javax::swing::text::html::FrameSetView *, ::javax::swing::text::Element *, jint);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) row;
-public: // actually package-private
-  ::javax::swing::text::html::FrameSetView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FrameSetView$FrameSetRow__
diff --git a/libjava/javax/swing/text/html/FrameSetView.h b/libjava/javax/swing/text/html/FrameSetView.h
deleted file mode 100644
index a31abb1ca11..00000000000
--- a/libjava/javax/swing/text/html/FrameSetView.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FrameSetView__
-#define __javax_swing_text_html_FrameSetView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class ViewFactory;
-        namespace html
-        {
-            class FrameSetView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FrameSetView : public ::javax::swing::text::BoxView
-{
-
-public: // actually package-private
-  FrameSetView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-private:
-  void parseRowsCols();
-  void parseLayout(::java::lang::String *, jint);
-public: // actually protected
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-public: // actually package-private
-  virtual void layoutViews(jint, jint, JArray< jint > *, JArray< jint > *, jint, JArray< jint > *, JArray< jint > *, JArray< jint > *);
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) absolute;
-  JArray< JArray< jint > * > * relative;
-  JArray< JArray< jint > * > * percent;
-  JArray< jint > * numViews;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FrameSetView__
diff --git a/libjava/javax/swing/text/html/FrameView.h b/libjava/javax/swing/text/html/FrameView.h
deleted file mode 100644
index e1856e327de..00000000000
--- a/libjava/javax/swing/text/html/FrameView.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FrameView__
-#define __javax_swing_text_html_FrameView__
-
-#pragma interface
-
-#include <javax/swing/text/ComponentView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace event
-      {
-          class HyperlinkEvent;
-      }
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class FrameView;
-            class HTMLFrameHyperlinkEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FrameView : public ::javax::swing::text::ComponentView
-{
-
-public: // actually package-private
-  FrameView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::awt::Component * createComponent();
-public:
-  virtual void hyperlinkUpdate(::javax::swing::event::HyperlinkEvent *);
-private:
-  void handleHyperlinkEvent(::javax::swing::event::HyperlinkEvent *, ::javax::swing::JEditorPane *, ::java::lang::String *);
-  void handleFormSubmitEvent(::javax::swing::text::html::HTMLFrameHyperlinkEvent *, ::javax::swing::JEditorPane *, ::java::lang::String *);
-  ::javax::swing::JEditorPane * getTopEditorPane();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FrameView__
diff --git a/libjava/javax/swing/text/html/HRuleView$Beginning.h b/libjava/javax/swing/text/html/HRuleView$Beginning.h
deleted file mode 100644
index a1c6e1dc808..00000000000
--- a/libjava/javax/swing/text/html/HRuleView$Beginning.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HRuleView$Beginning__
-#define __javax_swing_text_html_HRuleView$Beginning__
-
-#pragma interface
-
-#include <javax/swing/text/html/NullView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class HRuleView;
-            class HRuleView$Beginning;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HRuleView$Beginning : public ::javax::swing::text::html::NullView
-{
-
-public:
-  virtual jint getEndOffset();
-  virtual jint getStartOffset();
-  HRuleView$Beginning(::javax::swing::text::html::HRuleView *, ::javax::swing::text::Element *, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::html::NullView)))) breakOffset;
-  ::javax::swing::text::html::HRuleView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HRuleView$Beginning__
diff --git a/libjava/javax/swing/text/html/HRuleView.h b/libjava/javax/swing/text/html/HRuleView.h
deleted file mode 100644
index f028b51ae0b..00000000000
--- a/libjava/javax/swing/text/html/HRuleView.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HRuleView__
-#define __javax_swing_text_html_HRuleView__
-
-#pragma interface
-
-#include <javax/swing/text/html/InlineView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class View;
-        namespace html
-        {
-            class HRuleView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HRuleView : public ::javax::swing::text::html::InlineView
-{
-
-public:
-  HRuleView(::javax::swing::text::Element *);
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getPreferredSpan(jint);
-public: // actually package-private
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::html::InlineView)))) nullView;
-  static jint HEIGHT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HRuleView__
diff --git a/libjava/javax/swing/text/html/HTML$Attribute.h b/libjava/javax/swing/text/html/HTML$Attribute.h
deleted file mode 100644
index 47868d02dbc..00000000000
--- a/libjava/javax/swing/text/html/HTML$Attribute.h
+++ /dev/null
@@ -1,130 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTML$Attribute__
-#define __javax_swing_text_html_HTML$Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Attribute;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTML$Attribute : public ::java::lang::Object
-{
-
-  HTML$Attribute(::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-public: // actually package-private
-  static JArray< ::javax::swing::text::html::HTML$Attribute * > * getAllAttributes();
-public:
-  static ::javax::swing::text::html::HTML$Attribute * ACTION;
-  static ::javax::swing::text::html::HTML$Attribute * ALIGN;
-  static ::javax::swing::text::html::HTML$Attribute * ALINK;
-  static ::javax::swing::text::html::HTML$Attribute * ALT;
-  static ::javax::swing::text::html::HTML$Attribute * ARCHIVE;
-  static ::javax::swing::text::html::HTML$Attribute * BACKGROUND;
-  static ::javax::swing::text::html::HTML$Attribute * BGCOLOR;
-  static ::javax::swing::text::html::HTML$Attribute * BORDER;
-  static ::javax::swing::text::html::HTML$Attribute * CELLPADDING;
-  static ::javax::swing::text::html::HTML$Attribute * CELLSPACING;
-  static ::javax::swing::text::html::HTML$Attribute * CHECKED;
-  static ::javax::swing::text::html::HTML$Attribute * CLASS;
-  static ::javax::swing::text::html::HTML$Attribute * CLASSID;
-  static ::javax::swing::text::html::HTML$Attribute * CLEAR;
-  static ::javax::swing::text::html::HTML$Attribute * CODE;
-  static ::javax::swing::text::html::HTML$Attribute * CODEBASE;
-  static ::javax::swing::text::html::HTML$Attribute * CODETYPE;
-  static ::javax::swing::text::html::HTML$Attribute * COLOR;
-  static ::javax::swing::text::html::HTML$Attribute * COLS;
-  static ::javax::swing::text::html::HTML$Attribute * COLSPAN;
-  static ::javax::swing::text::html::HTML$Attribute * COMMENT;
-  static ::javax::swing::text::html::HTML$Attribute * COMPACT;
-  static ::javax::swing::text::html::HTML$Attribute * CONTENT;
-  static ::javax::swing::text::html::HTML$Attribute * COORDS;
-  static ::javax::swing::text::html::HTML$Attribute * DATA;
-  static ::javax::swing::text::html::HTML$Attribute * DECLARE;
-  static ::javax::swing::text::html::HTML$Attribute * DIR;
-  static ::javax::swing::text::html::HTML$Attribute * DUMMY;
-  static ::javax::swing::text::html::HTML$Attribute * ENCTYPE;
-  static ::javax::swing::text::html::HTML$Attribute * ENDTAG;
-  static ::javax::swing::text::html::HTML$Attribute * FACE;
-  static ::javax::swing::text::html::HTML$Attribute * FRAMEBORDER;
-  static ::javax::swing::text::html::HTML$Attribute * HALIGN;
-  static ::javax::swing::text::html::HTML$Attribute * HEIGHT;
-  static ::javax::swing::text::html::HTML$Attribute * HREF;
-  static ::javax::swing::text::html::HTML$Attribute * HSPACE;
-  static ::javax::swing::text::html::HTML$Attribute * HTTPEQUIV;
-  static ::javax::swing::text::html::HTML$Attribute * ID;
-  static ::javax::swing::text::html::HTML$Attribute * ISMAP;
-  static ::javax::swing::text::html::HTML$Attribute * LANG;
-  static ::javax::swing::text::html::HTML$Attribute * LANGUAGE;
-  static ::javax::swing::text::html::HTML$Attribute * LINK;
-  static ::javax::swing::text::html::HTML$Attribute * LOWSRC;
-  static ::javax::swing::text::html::HTML$Attribute * MARGINHEIGHT;
-  static ::javax::swing::text::html::HTML$Attribute * MARGINWIDTH;
-  static ::javax::swing::text::html::HTML$Attribute * MAXLENGTH;
-public: // actually package-private
-  static ::javax::swing::text::html::HTML$Attribute * MEDIA;
-public:
-  static ::javax::swing::text::html::HTML$Attribute * METHOD;
-  static ::javax::swing::text::html::HTML$Attribute * MULTIPLE;
-  static ::javax::swing::text::html::HTML$Attribute * N;
-  static ::javax::swing::text::html::HTML$Attribute * NAME;
-  static ::javax::swing::text::html::HTML$Attribute * NOHREF;
-  static ::javax::swing::text::html::HTML$Attribute * NORESIZE;
-  static ::javax::swing::text::html::HTML$Attribute * NOSHADE;
-  static ::javax::swing::text::html::HTML$Attribute * NOWRAP;
-  static ::javax::swing::text::html::HTML$Attribute * PROMPT;
-  static ::javax::swing::text::html::HTML$Attribute * REL;
-  static ::javax::swing::text::html::HTML$Attribute * REV;
-  static ::javax::swing::text::html::HTML$Attribute * ROWS;
-  static ::javax::swing::text::html::HTML$Attribute * ROWSPAN;
-  static ::javax::swing::text::html::HTML$Attribute * SCROLLING;
-  static ::javax::swing::text::html::HTML$Attribute * SELECTED;
-  static ::javax::swing::text::html::HTML$Attribute * SHAPE;
-  static ::javax::swing::text::html::HTML$Attribute * SHAPES;
-  static ::javax::swing::text::html::HTML$Attribute * SIZE;
-  static ::javax::swing::text::html::HTML$Attribute * SRC;
-  static ::javax::swing::text::html::HTML$Attribute * STANDBY;
-  static ::javax::swing::text::html::HTML$Attribute * START;
-  static ::javax::swing::text::html::HTML$Attribute * STYLE;
-  static ::javax::swing::text::html::HTML$Attribute * TARGET;
-  static ::javax::swing::text::html::HTML$Attribute * TEXT;
-  static ::javax::swing::text::html::HTML$Attribute * TITLE;
-  static ::javax::swing::text::html::HTML$Attribute * TYPE;
-  static ::javax::swing::text::html::HTML$Attribute * USEMAP;
-  static ::javax::swing::text::html::HTML$Attribute * VALIGN;
-  static ::javax::swing::text::html::HTML$Attribute * VALUE;
-  static ::javax::swing::text::html::HTML$Attribute * VALUETYPE;
-  static ::javax::swing::text::html::HTML$Attribute * VERSION;
-  static ::javax::swing::text::html::HTML$Attribute * VLINK;
-  static ::javax::swing::text::html::HTML$Attribute * VSPACE;
-  static ::javax::swing::text::html::HTML$Attribute * WIDTH;
-public: // actually package-private
-  static ::javax::swing::text::html::HTML$Attribute * PSEUDO_CLASS;
-  static ::javax::swing::text::html::HTML$Attribute * DYNAMIC_CLASS;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTML$Attribute__
diff --git a/libjava/javax/swing/text/html/HTML$Tag.h b/libjava/javax/swing/text/html/HTML$Tag.h
deleted file mode 100644
index 2dd2dcebac7..00000000000
--- a/libjava/javax/swing/text/html/HTML$Tag.h
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTML$Tag__
-#define __javax_swing_text_html_HTML$Tag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Tag;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTML$Tag : public ::java::lang::Object
-{
-
-public:
-  HTML$Tag();
-public: // actually protected
-  HTML$Tag(::java::lang::String *);
-  HTML$Tag(::java::lang::String *, jboolean, jboolean);
-public: // actually package-private
-  HTML$Tag(::java::lang::String *, jint);
-public:
-  virtual jboolean isBlock();
-  virtual jboolean isPreformatted();
-  virtual jboolean breaksFlow();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static JArray< ::javax::swing::text::html::HTML$Tag * > * getAllTags();
-  virtual jboolean isSyntetic();
-private:
-  static void unexpected(::java::lang::Exception *);
-public:
-  static ::javax::swing::text::html::HTML$Tag * A;
-  static ::javax::swing::text::html::HTML$Tag * ADDRESS;
-  static ::javax::swing::text::html::HTML$Tag * APPLET;
-  static ::javax::swing::text::html::HTML$Tag * AREA;
-  static ::javax::swing::text::html::HTML$Tag * B;
-  static ::javax::swing::text::html::HTML$Tag * BASE;
-  static ::javax::swing::text::html::HTML$Tag * BASEFONT;
-  static ::javax::swing::text::html::HTML$Tag * BIG;
-  static ::javax::swing::text::html::HTML$Tag * BLOCKQUOTE;
-  static ::javax::swing::text::html::HTML$Tag * BODY;
-  static ::javax::swing::text::html::HTML$Tag * BR;
-  static ::javax::swing::text::html::HTML$Tag * CAPTION;
-  static ::javax::swing::text::html::HTML$Tag * CENTER;
-  static ::javax::swing::text::html::HTML$Tag * CITE;
-  static ::javax::swing::text::html::HTML$Tag * CODE;
-  static ::javax::swing::text::html::HTML$Tag * DD;
-  static ::javax::swing::text::html::HTML$Tag * DFN;
-  static ::javax::swing::text::html::HTML$Tag * DIR;
-  static ::javax::swing::text::html::HTML$Tag * DIV;
-  static ::javax::swing::text::html::HTML$Tag * DL;
-  static ::javax::swing::text::html::HTML$Tag * DT;
-  static ::javax::swing::text::html::HTML$Tag * EM;
-  static ::javax::swing::text::html::HTML$Tag * FONT;
-  static ::javax::swing::text::html::HTML$Tag * FORM;
-  static ::javax::swing::text::html::HTML$Tag * FRAME;
-  static ::javax::swing::text::html::HTML$Tag * FRAMESET;
-  static ::javax::swing::text::html::HTML$Tag * H1;
-  static ::javax::swing::text::html::HTML$Tag * H2;
-  static ::javax::swing::text::html::HTML$Tag * H3;
-  static ::javax::swing::text::html::HTML$Tag * H4;
-  static ::javax::swing::text::html::HTML$Tag * H5;
-  static ::javax::swing::text::html::HTML$Tag * H6;
-  static ::javax::swing::text::html::HTML$Tag * HEAD;
-  static ::javax::swing::text::html::HTML$Tag * HR;
-  static ::javax::swing::text::html::HTML$Tag * HTML;
-  static ::javax::swing::text::html::HTML$Tag * I;
-  static ::javax::swing::text::html::HTML$Tag * IMG;
-  static ::javax::swing::text::html::HTML$Tag * INPUT;
-  static ::javax::swing::text::html::HTML$Tag * ISINDEX;
-  static ::javax::swing::text::html::HTML$Tag * KBD;
-  static ::javax::swing::text::html::HTML$Tag * LI;
-  static ::javax::swing::text::html::HTML$Tag * LINK;
-  static ::javax::swing::text::html::HTML$Tag * MAP;
-  static ::javax::swing::text::html::HTML$Tag * MENU;
-  static ::javax::swing::text::html::HTML$Tag * META;
-public: // actually package-private
-  static ::javax::swing::text::html::HTML$Tag * NOBR;
-public:
-  static ::javax::swing::text::html::HTML$Tag * NOFRAMES;
-  static ::javax::swing::text::html::HTML$Tag * OBJECT;
-  static ::javax::swing::text::html::HTML$Tag * OL;
-  static ::javax::swing::text::html::HTML$Tag * OPTION;
-  static ::javax::swing::text::html::HTML$Tag * P;
-  static ::javax::swing::text::html::HTML$Tag * PARAM;
-  static ::javax::swing::text::html::HTML$Tag * PRE;
-  static ::javax::swing::text::html::HTML$Tag * S;
-  static ::javax::swing::text::html::HTML$Tag * SAMP;
-  static ::javax::swing::text::html::HTML$Tag * SCRIPT;
-  static ::javax::swing::text::html::HTML$Tag * SELECT;
-  static ::javax::swing::text::html::HTML$Tag * SMALL;
-  static ::javax::swing::text::html::HTML$Tag * SPAN;
-  static ::javax::swing::text::html::HTML$Tag * STRIKE;
-  static ::javax::swing::text::html::HTML$Tag * STRONG;
-  static ::javax::swing::text::html::HTML$Tag * STYLE;
-  static ::javax::swing::text::html::HTML$Tag * SUB;
-  static ::javax::swing::text::html::HTML$Tag * SUP;
-  static ::javax::swing::text::html::HTML$Tag * TABLE;
-  static ::javax::swing::text::html::HTML$Tag * TD;
-  static ::javax::swing::text::html::HTML$Tag * TEXTAREA;
-  static ::javax::swing::text::html::HTML$Tag * TH;
-  static ::javax::swing::text::html::HTML$Tag * TITLE;
-  static ::javax::swing::text::html::HTML$Tag * TR;
-  static ::javax::swing::text::html::HTML$Tag * TT;
-  static ::javax::swing::text::html::HTML$Tag * U;
-  static ::javax::swing::text::html::HTML$Tag * UL;
-  static ::javax::swing::text::html::HTML$Tag * VAR;
-private:
-  static const jint TOTAL_SYNTHETIC_TAGS = 3;
-public:
-  static ::javax::swing::text::html::HTML$Tag * COMMENT;
-  static ::javax::swing::text::html::HTML$Tag * CONTENT;
-  static ::javax::swing::text::html::HTML$Tag * IMPLIED;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTML$Tag__
diff --git a/libjava/javax/swing/text/html/HTML$UnknownTag.h b/libjava/javax/swing/text/html/HTML$UnknownTag.h
deleted file mode 100644
index e499c01ccae..00000000000
--- a/libjava/javax/swing/text/html/HTML$UnknownTag.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTML$UnknownTag__
-#define __javax_swing_text_html_HTML$UnknownTag__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTML$Tag.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$UnknownTag;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTML$UnknownTag : public ::javax::swing::text::html::HTML$Tag
-{
-
-public:
-  HTML$UnknownTag(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1534369342247250625LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTML$UnknownTag__
diff --git a/libjava/javax/swing/text/html/HTML.h b/libjava/javax/swing/text/html/HTML.h
deleted file mode 100644
index 84dd640edc8..00000000000
--- a/libjava/javax/swing/text/html/HTML.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTML__
-#define __javax_swing_text_html_HTML__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class HTML;
-            class HTML$Attribute;
-            class HTML$Tag;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTML : public ::java::lang::Object
-{
-
-public:
-  HTML();
-  static JArray< ::javax::swing::text::html::HTML$Attribute * > * getAllAttributeKeys();
-  static JArray< ::javax::swing::text::html::HTML$Tag * > * getAllTags();
-  static ::javax::swing::text::html::HTML$Attribute * getAttributeKey(::java::lang::String *);
-  static jint getIntegerAttributeValue(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::HTML$Attribute *, jint);
-  static ::javax::swing::text::html::HTML$Tag * getTag(::java::lang::String *);
-  static ::java::lang::String * NULL_ATTRIBUTE_VALUE;
-public: // actually package-private
-  static const jint BREAKS = 1;
-  static const jint BLOCK = 2;
-  static const jint PREFORMATTED = 4;
-  static const jint SYNTHETIC = 8;
-private:
-  static ::java::util::Map * tagMap;
-  static ::java::util::Map * attrMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTML__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$1.h b/libjava/javax/swing/text/html/HTMLDocument$1.h
deleted file mode 100644
index 1c65c109a61..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$1__
-#define __javax_swing_text_html_HTMLDocument$1__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLDocument$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$1 : public ::javax::swing::text::html::HTMLDocument$HTMLReader
-{
-
-public: // actually package-private
-  HTMLDocument$1(::javax::swing::text::html::HTMLDocument *, jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-public:
-  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$1__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h b/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h
deleted file mode 100644
index efcaa223b47..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$BlockElement__
-#define __javax_swing_text_html_HTMLDocument$BlockElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$BranchElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class HTMLDocument;
-            class HTMLDocument$BlockElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$BlockElement : public ::javax::swing::text::AbstractDocument$BranchElement
-{
-
-public:
-  HTMLDocument$BlockElement(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$BlockElement__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h
deleted file mode 100644
index 0a6bd0daa03..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$AreaAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$AreaAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$AreaAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h
deleted file mode 100644
index 61e8e538555..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$BaseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$BaseAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$BaseAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h
deleted file mode 100644
index 52c202de24e..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$BlockAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$BlockAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h
deleted file mode 100644
index b8ae46357d4..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$CharacterAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$CharacterAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$CharacterAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h
deleted file mode 100644
index a58531a128a..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$ConvertAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$ConvertAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$ConvertAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h
deleted file mode 100644
index 263088b5aca..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$FormAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$FormAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction
-{
-
-public:
-  HTMLDocument$HTMLReader$FormAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-private:
-  void setModel(::java::lang::String *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction)))) this$1;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h
deleted file mode 100644
index e2e93a12b0b..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$FormTagAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$FormTagAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$FormTagAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h
deleted file mode 100644
index c150be73ab8..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$HeadAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$HeadAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$HeadAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h
deleted file mode 100644
index a7399eac4e9..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$HiddenAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$HiddenAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h
deleted file mode 100644
index 3457ed56cfc..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$IsindexAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$IsindexAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$IsindexAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h
deleted file mode 100644
index 2d73af7507d..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$LinkAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$LinkAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$LinkAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h
deleted file mode 100644
index 1b42e2f38e7..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$MapAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$MapAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$MapAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h
deleted file mode 100644
index a00b9fa2284..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$MetaAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$MetaAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$MetaAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h
deleted file mode 100644
index 8c816a79ebf..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$ParagraphAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$ParagraphAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
-{
-
-public:
-  HTMLDocument$HTMLReader$ParagraphAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h
deleted file mode 100644
index 1f5e38fd450..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$PreAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$PreAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
-{
-
-public:
-  HTMLDocument$HTMLReader$PreAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h
deleted file mode 100644
index c1005e6fbf8..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$SpecialAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$SpecialAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h
deleted file mode 100644
index 36feb57a007..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$StyleAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$StyleAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$StyleAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h
deleted file mode 100644
index 10550400bfa..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$TagAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$TagAction : public ::java::lang::Object
-{
-
-public:
-  HTMLDocument$HTMLReader$TagAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h
deleted file mode 100644
index 4b7a8fe6912..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$TitleAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$TitleAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$TitleAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h
deleted file mode 100644
index 57c250f6bbb..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLEditorKit$ParserCallback.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$TagAction;
-            class Option;
-            class ResetablePlainDocument;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader : public ::javax::swing::text::html::HTMLEditorKit$ParserCallback
-{
-
-public:
-  HTMLDocument$HTMLReader(::javax::swing::text::html::HTMLDocument *, jint);
-  HTMLDocument$HTMLReader(::javax::swing::text::html::HTMLDocument *, jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  virtual void initTags();
-public: // actually protected
-  virtual void pushCharacterStyle();
-  virtual void popCharacterStyle();
-  virtual void registerTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction *);
-public:
-  virtual void flush();
-private:
-  void flushImpl();
-public:
-  virtual void handleText(JArray< jchar > *, jint);
-private:
-  jboolean shouldInsert();
-public:
-  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleComment(JArray< jchar > *, jint);
-  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
-  virtual void handleSimpleTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleEndOfLineString(::java::lang::String *);
-public: // actually protected
-  virtual void textAreaContent(JArray< jchar > *);
-  virtual void preContent(JArray< jchar > *);
-  virtual void blockOpen(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-private:
-  jboolean inParagraph();
-  jboolean inImpliedParagraph();
-public: // actually protected
-  virtual void blockClose(::javax::swing::text::html::HTML$Tag *);
-  virtual void addContent(JArray< jchar > *, jint, jint);
-  virtual void addContent(JArray< jchar > *, jint, jint, jboolean);
-  virtual void addSpecialElement(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  static ::javax::swing::text::html::HTMLDocument * access$0(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-private:
-  static const jint MAX_THRESHOLD = 10000;
-  static const jint GROW_THRESHOLD = 5;
-public: // actually protected
-  ::javax::swing::text::MutableAttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$ParserCallback)))) charAttr;
-  ::java::util::Vector * parseBuffer;
-private:
-  ::java::util::Stack * parseStack;
-public: // actually package-private
-  ::java::util::Stack * charAttrStack;
-  ::java::util::HashMap * tagToAction;
-  jboolean endHTMLEncountered;
-  jint popDepth;
-  jint pushDepth;
-  jint offset;
-  ::javax::swing::text::html::HTML$Tag * insertTag;
-  jboolean insertTagEncountered;
-  jboolean debug;
-  jboolean inPreTag;
-  jboolean inStyleTag;
-  jboolean inTextArea;
-  ::java::util::ArrayList * styles;
-  ::javax::swing::text::html::ResetablePlainDocument * textAreaDocument;
-  ::java::lang::Object * selectModel;
-  ::javax::swing::text::html::Option * option;
-  jint numOptions;
-  ::java::util::HashMap * buttonGroups;
-private:
-  jint threshold;
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument * this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$Iterator.h b/libjava/javax/swing/text/html/HTMLDocument$Iterator.h
deleted file mode 100644
index 3b42157ef10..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$Iterator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$Iterator__
-#define __javax_swing_text_html_HTMLDocument$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$Iterator;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$Iterator : public ::java::lang::Object
-{
-
-public:
-  HTMLDocument$Iterator();
-  virtual ::javax::swing::text::AttributeSet * getAttributes() = 0;
-  virtual jint getEndOffset() = 0;
-  virtual jint getStartOffset() = 0;
-  virtual void next() = 0;
-  virtual jboolean isValid() = 0;
-  virtual ::javax::swing::text::html::HTML$Tag * getTag() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$Iterator__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h b/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h
deleted file mode 100644
index d449c79833b..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$LeafIterator__
-#define __javax_swing_text_html_HTMLDocument$LeafIterator__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$Iterator.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class ElementIterator;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLDocument$LeafIterator;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$LeafIterator : public ::javax::swing::text::html::HTMLDocument$Iterator
-{
-
-public:
-  HTMLDocument$LeafIterator(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTMLDocument *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jint getEndOffset();
-  virtual jint getStartOffset();
-  virtual void next();
-  virtual jboolean isValid();
-  virtual ::javax::swing::text::html::HTML$Tag * getTag();
-public: // actually package-private
-  ::javax::swing::text::html::HTML$Tag * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$Iterator)))) tag;
-  ::javax::swing::text::html::HTMLDocument * doc;
-  ::javax::swing::text::ElementIterator * it;
-  ::javax::swing::text::html::HTMLDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$LeafIterator__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$RunElement.h b/libjava/javax/swing/text/html/HTMLDocument$RunElement.h
deleted file mode 100644
index f0c65d99c2d..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$RunElement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$RunElement__
-#define __javax_swing_text_html_HTMLDocument$RunElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$LeafElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class HTMLDocument;
-            class HTMLDocument$RunElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$RunElement : public ::javax::swing::text::AbstractDocument$LeafElement
-{
-
-public:
-  HTMLDocument$RunElement(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$LeafElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$RunElement__
diff --git a/libjava/javax/swing/text/html/HTMLDocument.h b/libjava/javax/swing/text/html/HTMLDocument.h
deleted file mode 100644
index 014f818af3a..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument__
-#define __javax_swing_text_html_HTMLDocument__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultStyledDocument.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$AbstractElement;
-          class AbstractDocument$AttributeContext;
-          class AbstractDocument$Content;
-          class AbstractDocument$DefaultDocumentEvent;
-          class AttributeSet;
-          class DefaultStyledDocument$ElementSpec;
-          class Element;
-        namespace html
-        {
-            class HTML$Attribute;
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLDocument$Iterator;
-            class HTMLEditorKit$Parser;
-            class HTMLEditorKit$ParserCallback;
-            class HTMLFrameHyperlinkEvent;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument : public ::javax::swing::text::DefaultStyledDocument
-{
-
-public:
-  HTMLDocument();
-  HTMLDocument(::javax::swing::text::html::StyleSheet *);
-  HTMLDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::html::StyleSheet *);
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
-  virtual ::javax::swing::text::Element * createLeafElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
-  virtual ::javax::swing::text::Element * createBranchElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-public:
-  virtual ::javax::swing::text::html::HTMLEditorKit$Parser * getParser();
-  virtual void setParser(::javax::swing::text::html::HTMLEditorKit$Parser *);
-  virtual void setTokenThreshold(jint);
-  virtual jint getTokenThreshold();
-  virtual ::java::net::URL * getBase();
-  virtual void setBase(::java::net::URL *);
-  virtual jboolean getPreservesUnknownTags();
-  virtual void setPreservesUnknownTags(jboolean);
-  virtual void processHTMLFrameHyperlinkEvent(::javax::swing::text::html::HTMLFrameHyperlinkEvent *);
-private:
-  ::javax::swing::text::Element * findFrame(::java::lang::String *);
-  void updateFrame(::javax::swing::text::Element *, ::java::net::URL *);
-  void updateFrameSet(::javax::swing::text::Element *, ::java::net::URL *);
-public:
-  virtual ::javax::swing::text::html::HTMLDocument$Iterator * getIterator(::javax::swing::text::html::HTML$Tag *);
-  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getReader(jint);
-  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getReader(jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getInsertingReader(jint, jint, jint, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::Element *);
-  virtual ::javax::swing::text::Element * getElement(::javax::swing::text::Element *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::text::Element * getElement(::java::lang::String *);
-  virtual void setInnerHTML(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void setOuterHTML(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void insertBeforeStart(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void insertBeforeEnd(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void insertAfterEnd(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void insertAfterStart(::javax::swing::text::Element *, ::java::lang::String *);
-public: // actually protected
-  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  virtual jboolean isFrameDocument();
-  virtual void setFrameDocument(jboolean);
-  virtual ::java::lang::String * getBaseTarget();
-  virtual void updateSpecialClass(::javax::swing::text::Element *, ::javax::swing::text::html::HTML$Attribute *, ::java::lang::String *);
-  static void access$0(::javax::swing::text::html::HTMLDocument *, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  static void access$1(::javax::swing::text::html::HTMLDocument *, jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  static ::javax::swing::text::AbstractDocument$AttributeContext * access$2(::javax::swing::text::html::HTMLDocument *);
-public:
-  static ::java::lang::String * AdditionalComments;
-public: // actually package-private
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultStyledDocument)))) baseURL;
-  jboolean preservesUnknownTags;
-  jint tokenThreshold;
-  ::javax::swing::text::html::HTMLEditorKit$Parser * parser;
-private:
-  jboolean frameDocument;
-public: // actually package-private
-  ::java::lang::String * baseTarget;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h b/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h
deleted file mode 100644
index 8780e781a67..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
-#define __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class View;
-        namespace html
-        {
-            class HTMLEditorKit$HTMLFactory;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$HTMLFactory : public ::java::lang::Object
-{
-
-public:
-  HTMLEditorKit$HTMLFactory();
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h b/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h
deleted file mode 100644
index 05cf7f3e5f5..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
-#define __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLEditorKit;
-            class HTMLEditorKit$HTMLTextAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$HTMLTextAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  HTMLEditorKit$HTMLTextAction(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::text::html::HTMLDocument * getHTMLDocument(::javax::swing::JEditorPane *);
-  virtual ::javax::swing::text::html::HTMLEditorKit * getHTMLEditorKit(::javax::swing::JEditorPane *);
-  virtual JArray< ::javax::swing::text::Element * > * getElementsAt(::javax::swing::text::html::HTMLDocument *, jint);
-private:
-  JArray< ::javax::swing::text::Element * > * getElementsAt(::javax::swing::text::Element *, jint, jint);
-public: // actually protected
-  virtual jint elementCountToTag(::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *);
-  virtual ::javax::swing::text::Element * findElementMatchingTag(::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h b/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h
deleted file mode 100644
index 187c7a8ee76..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
-#define __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLEditorKit$InsertHTMLTextAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$InsertHTMLTextAction : public ::javax::swing::text::html::HTMLEditorKit$HTMLTextAction
-{
-
-public:
-  HTMLEditorKit$InsertHTMLTextAction(::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-  HTMLEditorKit$InsertHTMLTextAction(::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-public: // actually protected
-  virtual void insertHTML(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::java::lang::String *, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-  virtual void insertAtBoundary(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-  virtual void insertAtBoundry(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  jboolean tryInsert(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-  void adjustSelection(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, jint);
-public: // actually protected
-  ::javax::swing::text::html::HTML$Tag * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$HTMLTextAction)))) addTag;
-  ::javax::swing::text::html::HTML$Tag * alternateAddTag;
-  ::javax::swing::text::html::HTML$Tag * alternateParentTag;
-  ::java::lang::String * html;
-  ::javax::swing::text::html::HTML$Tag * parentTag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h b/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h
deleted file mode 100644
index 629cc679e6d..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$LinkController__
-#define __javax_swing_text_html_HTMLEditorKit$LinkController__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace event
-      {
-          class HyperlinkEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class HTMLDocument;
-            class HTMLEditorKit$LinkController;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$LinkController : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  HTMLEditorKit$LinkController();
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually protected
-  virtual void activateLink(jint, ::javax::swing::JEditorPane *);
-private:
-  void activateLink(jint, ::javax::swing::JEditorPane *, jint, jint);
-  ::javax::swing::event::HyperlinkEvent * createHyperlinkEvent(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, ::java::lang::String *, ::javax::swing::text::AttributeSet *, ::javax::swing::text::Element *);
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) lastAnchorElement;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$LinkController__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h b/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h
deleted file mode 100644
index 8727c6ca646..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$Parser__
-#define __javax_swing_text_html_HTMLEditorKit$Parser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTMLEditorKit$Parser;
-            class HTMLEditorKit$ParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$Parser : public ::java::lang::Object
-{
-
-public:
-  HTMLEditorKit$Parser();
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$Parser__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h b/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h
deleted file mode 100644
index 83dffff9405..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$ParserCallback__
-#define __javax_swing_text_html_HTMLEditorKit$ParserCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLEditorKit$ParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$ParserCallback : public ::java::lang::Object
-{
-
-public:
-  HTMLEditorKit$ParserCallback();
-  virtual void flush();
-  virtual void handleComment(JArray< jchar > *, jint);
-  virtual void handleEndOfLineString(::java::lang::String *);
-  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
-  virtual void handleError(::java::lang::String *, jint);
-  virtual void handleSimpleTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleText(JArray< jchar > *, jint);
-  static ::java::lang::Object * IMPLIED;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$ParserCallback__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit.h b/libjava/javax/swing/text/html/HTMLEditorKit.h
deleted file mode 100644
index 4c3bc412c39..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit__
-#define __javax_swing_text_html_HTMLEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Cursor;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class JEditorPane;
-      namespace text
-      {
-          class Document;
-          class Element;
-          class MutableAttributeSet;
-          class ViewFactory;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLEditorKit;
-            class HTMLEditorKit$HTMLFactory;
-            class HTMLEditorKit$LinkController;
-            class HTMLEditorKit$Parser;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit : public ::javax::swing::text::StyledEditorKit
-{
-
-public:
-  HTMLEditorKit();
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual ::javax::swing::text::Document * createDefaultDocument();
-public: // actually protected
-  virtual ::javax::swing::text::html::HTMLEditorKit$Parser * getParser();
-public:
-  virtual void insertHTML(::javax::swing::text::html::HTMLDocument *, jint, ::java::lang::String *, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
-  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
-  virtual ::java::lang::String * getContentType();
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void createInputAttributes(::javax::swing::text::Element *, ::javax::swing::text::MutableAttributeSet *);
-public:
-  virtual void install(::javax::swing::JEditorPane *);
-  virtual void deinstall(::javax::swing::JEditorPane *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual ::java::awt::Cursor * getDefaultCursor();
-  virtual ::java::awt::Cursor * getLinkCursor();
-  virtual void setLinkCursor(::java::awt::Cursor *);
-  virtual void setDefaultCursor(::java::awt::Cursor *);
-  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-  virtual void setStyleSheet(::javax::swing::text::html::StyleSheet *);
-  virtual jboolean isAutoFormSubmission();
-  virtual void setAutoFormSubmission(jboolean);
-private:
-  static const jlong serialVersionUID = 8751997116710384592LL;
-public:
-  static ::java::lang::String * DEFAULT_CSS;
-  static ::java::lang::String * BOLD_ACTION;
-  static ::java::lang::String * ITALIC_ACTION;
-  static ::java::lang::String * COLOR_ACTION;
-  static ::java::lang::String * FONT_CHANGE_BIGGER;
-  static ::java::lang::String * FONT_CHANGE_SMALLER;
-  static ::java::lang::String * IMG_ALIGN_BOTTOM;
-  static ::java::lang::String * IMG_ALIGN_MIDDLE;
-  static ::java::lang::String * IMG_ALIGN_TOP;
-  static ::java::lang::String * IMG_BORDER;
-  static ::java::lang::String * LOGICAL_STYLE_ACTION;
-  static ::java::lang::String * PARA_INDENT_LEFT;
-  static ::java::lang::String * PARA_INDENT_RIGHT;
-private:
-  static JArray< ::javax::swing::Action * > * defaultActions;
-  ::javax::swing::text::html::StyleSheet * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit)))) styleSheet;
-public: // actually package-private
-  ::javax::swing::text::html::HTMLEditorKit$HTMLFactory * viewFactory;
-  ::java::awt::Cursor * linkCursor;
-  ::java::awt::Cursor * defaultCursor;
-  ::javax::swing::text::html::HTMLEditorKit$Parser * parser;
-private:
-  ::javax::swing::text::html::HTMLEditorKit$LinkController * linkController;
-public: // actually package-private
-  ::java::lang::String * contentType;
-  ::javax::swing::text::MutableAttributeSet * inputAttributes;
-  ::javax::swing::JEditorPane * editorPane;
-private:
-  jboolean autoFormSubmission;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit__
diff --git a/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h b/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h
deleted file mode 100644
index 140395092ac..00000000000
--- a/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLFrameHyperlinkEvent__
-#define __javax_swing_text_html_HTMLFrameHyperlinkEvent__
-
-#pragma interface
-
-#include <javax/swing/event/HyperlinkEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent$EventType;
-      }
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class HTMLFrameHyperlinkEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLFrameHyperlinkEvent : public ::javax::swing::event::HyperlinkEvent
-{
-
-public:
-  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::javax::swing::text::Element *, ::java::lang::String *);
-  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *);
-  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::javax::swing::text::Element *, ::java::lang::String *);
-  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getTarget();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::event::HyperlinkEvent)))) target_frame;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLFrameHyperlinkEvent__
diff --git a/libjava/javax/swing/text/html/HTMLWriter.h b/libjava/javax/swing/text/html/HTMLWriter.h
deleted file mode 100644
index 63684b7933b..00000000000
--- a/libjava/javax/swing/text/html/HTMLWriter.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLWriter__
-#define __javax_swing_text_html_HTMLWriter__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractWriter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLWriter;
-            class Option;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLWriter : public ::javax::swing::text::AbstractWriter
-{
-
-public:
-  HTMLWriter(::java::io::Writer *, ::javax::swing::text::html::HTMLDocument *);
-  HTMLWriter(::java::io::Writer *, ::javax::swing::text::html::HTMLDocument *, jint, jint);
-  virtual void write();
-public: // actually protected
-  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void emptyTag(::javax::swing::text::Element *);
-  virtual jboolean isBlockTag(::javax::swing::text::AttributeSet *);
-  virtual void startTag(::javax::swing::text::Element *);
-  virtual void textAreaContent(::javax::swing::text::AttributeSet *);
-  virtual void text(::javax::swing::text::Element *);
-  virtual void selectContent(::javax::swing::text::AttributeSet *);
-  virtual void writeOption(::javax::swing::text::html::Option *);
-  virtual void endTag(::javax::swing::text::Element *);
-  virtual void comment(::javax::swing::text::Element *);
-  virtual jboolean synthesizedElement(::javax::swing::text::Element *);
-  virtual jboolean matchNameAttribute(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::HTML$Tag *);
-  virtual void writeEmbeddedTags(::javax::swing::text::AttributeSet *);
-  virtual void closeOutUnwantedEmbeddedTags(::javax::swing::text::AttributeSet *);
-  virtual void writeLineSeparator();
-  virtual void output(JArray< jchar > *, jint, jint);
-private:
-  void traverse(::javax::swing::text::Element *);
-  void traverseHtmlFragment(::javax::swing::text::Element *);
-  void writeRaw(::java::lang::String *);
-  void writeContent(::java::lang::String *);
-  void writeAllAttributes(::javax::swing::text::AttributeSet *);
-  jboolean hasHtmlEntity(::java::lang::String *);
-  jboolean isCharHtmlEntity(jchar);
-  ::java::lang::String * escapeCharHtmlEntity(jchar);
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) outWriter;
-  ::javax::swing::text::html::HTMLDocument * htmlDoc;
-  ::java::util::HashSet * openEmbeddedTagHashSet;
-  ::java::lang::String * new_line_str;
-  JArray< jchar > * html_entity_char_arr;
-  JArray< ::java::lang::String * > * html_entity_escape_str_arr;
-  jint doc_pos;
-  jint doc_len;
-  jint doc_offset_remaining;
-  jint doc_len_remaining;
-  ::java::util::HashSet * htmlFragmentParentHashSet;
-  ::javax::swing::text::Element * startElem;
-  ::javax::swing::text::Element * endElem;
-  jboolean fg_pass_start_elem;
-  jboolean fg_pass_end_elem;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLWriter__
diff --git a/libjava/javax/swing/text/html/ImageView$1.h b/libjava/javax/swing/text/html/ImageView$1.h
deleted file mode 100644
index b6acde7564c..00000000000
--- a/libjava/javax/swing/text/html/ImageView$1.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ImageView$1__
-#define __javax_swing_text_html_ImageView$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class View;
-        namespace html
-        {
-            class ImageView;
-            class ImageView$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ImageView$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImageView$1(::javax::swing::text::html::ImageView *, ::javax::swing::text::View *, jboolean, jboolean);
-public:
-  virtual void run();
-public: // actually package-private
-  ::javax::swing::text::html::ImageView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::swing::text::View * val$v;
-  jboolean val$width;
-  jboolean val$height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ImageView$1__
diff --git a/libjava/javax/swing/text/html/ImageView$Observer.h b/libjava/javax/swing/text/html/ImageView$Observer.h
deleted file mode 100644
index be4b8dbf9dc..00000000000
--- a/libjava/javax/swing/text/html/ImageView$Observer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ImageView$Observer__
-#define __javax_swing_text_html_ImageView$Observer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class ImageView;
-            class ImageView$Observer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ImageView$Observer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImageView$Observer(::javax::swing::text::html::ImageView *);
-public:
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-public: // actually package-private
-  ::javax::swing::text::html::ImageView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ImageView$Observer__
diff --git a/libjava/javax/swing/text/html/ImageView.h b/libjava/javax/swing/text/html/ImageView.h
deleted file mode 100644
index 91b96bc012b..00000000000
--- a/libjava/javax/swing/text/html/ImageView.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ImageView__
-#define __javax_swing_text_html_ImageView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class Position$Bias;
-          class View;
-        namespace html
-        {
-            class ImageView;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ImageView : public ::javax::swing::text::View
-{
-
-public:
-  ImageView(::javax::swing::text::Element *);
-private:
-  void reloadImage();
-public:
-  virtual jfloat getAlignment(jint);
-  virtual ::java::lang::String * getAltText();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual ::java::awt::Image * getImage();
-  virtual ::java::net::URL * getImageURL();
-  virtual ::javax::swing::Icon * getLoadingImageIcon();
-  virtual jboolean getLoadsSynchronously();
-  virtual ::javax::swing::Icon * getNoImageIcon();
-  virtual jfloat getPreferredSpan(jint);
-public: // actually protected
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-public:
-  virtual ::java::lang::String * getToolTipText(jfloat, jfloat, ::java::awt::Shape *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual void setLoadsSynchronously(jboolean);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-public:
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual void setSize(jfloat, jfloat);
-private:
-  void updateState();
-  void loadImage();
-  void updateSize();
-public: // actually package-private
-  virtual void safePreferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) loadOnDemand;
-  ::java::awt::Image * image;
-  jbyte imageState;
-private:
-  jboolean reloadImage__;
-  jboolean reloadProperties;
-  jboolean haveWidth;
-  jboolean haveHeight;
-  jboolean loading;
-  jint width;
-  jint height;
-  ::java::awt::image::ImageObserver * observer;
-public: // actually package-private
-  JArray< ::gnu::javax::swing::text::html::css::Length * > * spans;
-private:
-  ::javax::swing::text::AttributeSet * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ImageView__
diff --git a/libjava/javax/swing/text/html/InlineView.h b/libjava/javax/swing/text/html/InlineView.h
deleted file mode 100644
index 0d552dd7e8d..00000000000
--- a/libjava/javax/swing/text/html/InlineView.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_InlineView__
-#define __javax_swing_text_html_InlineView__
-
-#pragma interface
-
-#include <javax/swing/text/LabelView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class View;
-          class ViewFactory;
-        namespace html
-        {
-            class InlineView;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::InlineView : public ::javax::swing::text::LabelView
-{
-
-public:
-  InlineView(::javax::swing::text::Element *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-public:
-  virtual jfloat getMinimumSpan(jint);
-private:
-  jfloat getLongestWord();
-  jfloat calculateLongestWord();
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::LabelView)))) attributes;
-  jfloat longestWord;
-  jboolean nowrap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_InlineView__
diff --git a/libjava/javax/swing/text/html/ListView.h b/libjava/javax/swing/text/html/ListView.h
deleted file mode 100644
index 7e179a90c69..00000000000
--- a/libjava/javax/swing/text/html/ListView.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ListView__
-#define __javax_swing_text_html_ListView__
-
-#pragma interface
-
-#include <javax/swing/text/html/BlockView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class ListView;
-            class StyleSheet$ListPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ListView : public ::javax::swing::text::html::BlockView
-{
-
-public:
-  ListView(::javax::swing::text::Element *);
-  virtual jfloat getAlignment(jint);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-public: // actually protected
-  virtual void paintChild(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void setPropertiesFromAttributes();
-private:
-  ::javax::swing::text::html::StyleSheet$ListPainter * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) painter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ListView__
diff --git a/libjava/javax/swing/text/html/MinimalHTMLWriter.h b/libjava/javax/swing/text/html/MinimalHTMLWriter.h
deleted file mode 100644
index a44b170055d..00000000000
--- a/libjava/javax/swing/text/html/MinimalHTMLWriter.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_MinimalHTMLWriter__
-#define __javax_swing_text_html_MinimalHTMLWriter__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractWriter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class Style;
-          class StyledDocument;
-        namespace html
-        {
-            class MinimalHTMLWriter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::MinimalHTMLWriter : public ::javax::swing::text::AbstractWriter
-{
-
-public:
-  MinimalHTMLWriter(::java::io::Writer *, ::javax::swing::text::StyledDocument *);
-  MinimalHTMLWriter(::java::io::Writer *, ::javax::swing::text::StyledDocument *, jint, jint);
-public: // actually protected
-  virtual void startFontTag(::java::lang::String *);
-  virtual jboolean inFontTag();
-  virtual void endFontTag();
-public:
-  virtual void write();
-public: // actually protected
-  virtual void writeStartTag(::java::lang::String *);
-  virtual void writeEndTag(::java::lang::String *);
-  virtual void writeHeader();
-  virtual void writeStartParagraph(::javax::swing::text::Element *);
-  virtual void writeEndParagraph();
-  virtual void writeBody();
-  virtual void text(::javax::swing::text::Element *);
-  virtual void writeHTMLTags(::javax::swing::text::AttributeSet *);
-  virtual jboolean isText(::javax::swing::text::Element *);
-  virtual void writeContent(::javax::swing::text::Element *, jboolean);
-  virtual void writeLeaf(::javax::swing::text::Element *);
-  virtual void writeNonHTMLAttributes(::javax::swing::text::AttributeSet *);
-  virtual void writeStyles();
-  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void writeComponent(::javax::swing::text::Element *);
-  virtual void writeImage(::javax::swing::text::Element *);
-private:
-  ::java::lang::String * getAttribute(::java::lang::String *, ::java::lang::Object *);
-  ::java::lang::String * getColor(::java::awt::Color *);
-  void endOpenTags();
-  void writeStyle(::javax::swing::text::Style *);
-  jboolean hasText(::javax::swing::text::Element *);
-  ::javax::swing::text::StyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) doc;
-  ::java::util::Deque * tagStack;
-  jboolean inFontTag__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_MinimalHTMLWriter__
diff --git a/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h b/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h
deleted file mode 100644
index 5705c57ad50..00000000000
--- a/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
-#define __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class MultiAttributeSet;
-            class MultiAttributeSet$MultiNameEnumeration;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::MultiAttributeSet$MultiNameEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MultiAttributeSet$MultiNameEnumeration(::javax::swing::text::html::MultiAttributeSet *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  ::java::util::Enumeration * current;
-public: // actually package-private
-  ::javax::swing::text::html::MultiAttributeSet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
diff --git a/libjava/javax/swing/text/html/MultiAttributeSet.h b/libjava/javax/swing/text/html/MultiAttributeSet.h
deleted file mode 100644
index f189e7c5528..00000000000
--- a/libjava/javax/swing/text/html/MultiAttributeSet.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_MultiAttributeSet__
-#define __javax_swing_text_html_MultiAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class MultiAttributeSet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::MultiAttributeSet : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MultiAttributeSet();
-  MultiAttributeSet(JArray< ::javax::swing::text::AttributeSet * > *);
-  virtual void init(JArray< ::javax::swing::text::AttributeSet * > *);
-public:
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  JArray< ::javax::swing::text::AttributeSet * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) multi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_MultiAttributeSet__
diff --git a/libjava/javax/swing/text/html/MultiStyle.h b/libjava/javax/swing/text/html/MultiStyle.h
deleted file mode 100644
index f330d5f6e47..00000000000
--- a/libjava/javax/swing/text/html/MultiStyle.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_MultiStyle__
-#define __javax_swing_text_html_MultiStyle__
-
-#pragma interface
-
-#include <javax/swing/text/html/MultiAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class SimpleAttributeSet;
-        namespace html
-        {
-            class MultiStyle;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::MultiStyle : public ::javax::swing::text::html::MultiAttributeSet
-{
-
-public:
-  MultiStyle(::java::lang::String *, JArray< ::javax::swing::text::AttributeSet * > *);
-  virtual ::java::lang::String * getName();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual void addAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttribute(::java::lang::Object *);
-  virtual void removeAttributes(::java::util::Enumeration *);
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::html::MultiAttributeSet)))) name;
-  ::javax::swing::text::SimpleAttributeSet * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_MultiStyle__
diff --git a/libjava/javax/swing/text/html/NullView.h b/libjava/javax/swing/text/html/NullView.h
deleted file mode 100644
index 2947ee72769..00000000000
--- a/libjava/javax/swing/text/html/NullView.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_NullView__
-#define __javax_swing_text_html_NullView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class Position$Bias;
-        namespace html
-        {
-            class NullView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::NullView : public ::javax::swing::text::View
-{
-
-public:
-  NullView(::javax::swing::text::Element *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_NullView__
diff --git a/libjava/javax/swing/text/html/ObjectView.h b/libjava/javax/swing/text/html/ObjectView.h
deleted file mode 100644
index 666b671aa0d..00000000000
--- a/libjava/javax/swing/text/html/ObjectView.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ObjectView__
-#define __javax_swing_text_html_ObjectView__
-
-#pragma interface
-
-#include <javax/swing/text/ComponentView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class ObjectView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ObjectView : public ::javax::swing::text::ComponentView
-{
-
-public:
-  ObjectView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::awt::Component * createComponent();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ObjectView__
diff --git a/libjava/javax/swing/text/html/Option.h b/libjava/javax/swing/text/html/Option.h
deleted file mode 100644
index 062c069e9bb..00000000000
--- a/libjava/javax/swing/text/html/Option.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_Option__
-#define __javax_swing_text_html_Option__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class Option;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::Option : public ::java::lang::Object
-{
-
-public:
-  Option(::javax::swing::text::AttributeSet *);
-  virtual void setLabel(::java::lang::String *);
-  virtual ::java::lang::String * getLabel();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual void setSelection(jboolean);
-public:
-  virtual jboolean isSelected();
-  virtual ::java::lang::String * getValue();
-private:
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
-  ::java::lang::String * label;
-  jboolean selected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_Option__
diff --git a/libjava/javax/swing/text/html/ParagraphView.h b/libjava/javax/swing/text/html/ParagraphView.h
deleted file mode 100644
index 6e166ad877d..00000000000
--- a/libjava/javax/swing/text/html/ParagraphView.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ParagraphView__
-#define __javax_swing_text_html_ParagraphView__
-
-#pragma interface
-
-#include <javax/swing/text/ParagraphView.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class View;
-        namespace html
-        {
-            class ParagraphView;
-            class StyleSheet;
-            class StyleSheet$BoxPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ParagraphView : public ::javax::swing::text::ParagraphView
-{
-
-public:
-  ParagraphView(::javax::swing::text::Element *);
-  virtual void setParent(::javax::swing::text::View *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-private:
-  jboolean setCSSSpan(::javax::swing::SizeRequirements *, jint);
-public:
-  virtual jboolean isVisible();
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-private:
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::ParagraphView)))) attributes;
-  ::javax::swing::text::html::StyleSheet$BoxPainter * painter;
-  ::gnu::javax::swing::text::html::css::Length * cssWidth;
-  ::gnu::javax::swing::text::html::css::Length * cssHeight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ParagraphView__
diff --git a/libjava/javax/swing/text/html/ResetableModel.h b/libjava/javax/swing/text/html/ResetableModel.h
deleted file mode 100644
index f07a0ed9aa2..00000000000
--- a/libjava/javax/swing/text/html/ResetableModel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ResetableModel__
-#define __javax_swing_text_html_ResetableModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class ResetableModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ResetableModel : public ::java::lang::Object
-{
-
-public:
-  virtual void reset() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_html_ResetableModel__
diff --git a/libjava/javax/swing/text/html/ResetablePlainDocument.h b/libjava/javax/swing/text/html/ResetablePlainDocument.h
deleted file mode 100644
index 31283e50bfb..00000000000
--- a/libjava/javax/swing/text/html/ResetablePlainDocument.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ResetablePlainDocument__
-#define __javax_swing_text_html_ResetablePlainDocument__
-
-#pragma interface
-
-#include <javax/swing/text/PlainDocument.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class ResetablePlainDocument;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ResetablePlainDocument : public ::javax::swing::text::PlainDocument
-{
-
-public: // actually package-private
-  ResetablePlainDocument();
-  virtual void setInitialText(::java::lang::String *);
-public:
-  virtual void reset();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::PlainDocument)))) initial;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ResetablePlainDocument__
diff --git a/libjava/javax/swing/text/html/ResetableToggleButtonModel.h b/libjava/javax/swing/text/html/ResetableToggleButtonModel.h
deleted file mode 100644
index 13295225b78..00000000000
--- a/libjava/javax/swing/text/html/ResetableToggleButtonModel.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ResetableToggleButtonModel__
-#define __javax_swing_text_html_ResetableToggleButtonModel__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton$ToggleButtonModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class ResetableToggleButtonModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ResetableToggleButtonModel : public ::javax::swing::JToggleButton$ToggleButtonModel
-{
-
-public: // actually package-private
-  ResetableToggleButtonModel();
-public:
-  virtual void setInitial(jboolean);
-  virtual void reset();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$ToggleButtonModel)))) initial;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ResetableToggleButtonModel__
diff --git a/libjava/javax/swing/text/html/SelectComboBoxModel.h b/libjava/javax/swing/text/html/SelectComboBoxModel.h
deleted file mode 100644
index e9ae5c6fe0f..00000000000
--- a/libjava/javax/swing/text/html/SelectComboBoxModel.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_SelectComboBoxModel__
-#define __javax_swing_text_html_SelectComboBoxModel__
-
-#pragma interface
-
-#include <javax/swing/DefaultComboBoxModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class Option;
-            class SelectComboBoxModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::SelectComboBoxModel : public ::javax::swing::DefaultComboBoxModel
-{
-
-public: // actually package-private
-  SelectComboBoxModel();
-  virtual void setInitialSelection(::javax::swing::text::html::Option *);
-  virtual ::javax::swing::text::html::Option * getInitialSelection();
-public:
-  virtual void reset();
-private:
-  ::javax::swing::text::html::Option * __attribute__((aligned(__alignof__( ::javax::swing::DefaultComboBoxModel)))) initial;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_SelectComboBoxModel__
diff --git a/libjava/javax/swing/text/html/SelectListModel.h b/libjava/javax/swing/text/html/SelectListModel.h
deleted file mode 100644
index 85ce6c3d429..00000000000
--- a/libjava/javax/swing/text/html/SelectListModel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_SelectListModel__
-#define __javax_swing_text_html_SelectListModel__
-
-#pragma interface
-
-#include <javax/swing/DefaultListModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListSelectionModel;
-        class ListSelectionModel;
-      namespace text
-      {
-        namespace html
-        {
-            class SelectListModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::SelectListModel : public ::javax::swing::DefaultListModel
-{
-
-public: // actually package-private
-  SelectListModel();
-  virtual void addInitialSelection(jint);
-public:
-  virtual void reset();
-public: // actually package-private
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
-private:
-  ::javax::swing::DefaultListSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListModel)))) selectionModel;
-  ::java::util::BitSet * initialSelection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_SelectListModel__
diff --git a/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h b/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h
deleted file mode 100644
index 739686890a9..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$BoxPainter__
-#define __javax_swing_text_html_StyleSheet$BoxPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class View;
-        namespace html
-        {
-            class StyleSheet;
-            class StyleSheet$BoxPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$BoxPainter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$BoxPainter(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
-public:
-  virtual jfloat getInset(jint, ::javax::swing::text::View *);
-  virtual void paint(::java::awt::Graphics *, jfloat, jfloat, jfloat, jfloat, ::javax::swing::text::View *);
-private:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) leftInset;
-  jfloat rightInset;
-  jfloat topInset;
-  jfloat bottomInset;
-  ::javax::swing::border::Border * border;
-  jfloat leftPadding;
-  jfloat rightPadding;
-  jfloat topPadding;
-  jfloat bottomPadding;
-  ::java::awt::Color * background;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$BoxPainter__
diff --git a/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h b/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h
deleted file mode 100644
index 3266efd1c00..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$CSSStyle__
-#define __javax_swing_text_html_StyleSheet$CSSStyle__
-
-#pragma interface
-
-#include <javax/swing/text/SimpleAttributeSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Selector;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-        namespace html
-        {
-            class StyleSheet;
-            class StyleSheet$CSSStyle;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$CSSStyle : public ::javax::swing::text::SimpleAttributeSet
-{
-
-public: // actually package-private
-  StyleSheet$CSSStyle(::javax::swing::text::html::StyleSheet *, jint, ::gnu::javax::swing::text::html::css::Selector *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual jint StyleSheet$CSSStyle$compareTo(::javax::swing::text::html::StyleSheet$CSSStyle *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  static const jint PREC_UA = 0;
-  static const jint PREC_NORM = 100000;
-  static const jint PREC_AUTHOR_NORMAL = 200000;
-  static const jint PREC_AUTHOR_IMPORTANT = 300000;
-  static const jint PREC_USER_IMPORTANT = 400000;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::SimpleAttributeSet)))) precedence;
-public: // actually package-private
-  ::gnu::javax::swing::text::html::css::Selector * selector;
-  ::javax::swing::text::html::StyleSheet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$CSSStyle__
diff --git a/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h b/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h
deleted file mode 100644
index 43c5813788c..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
-#define __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Selector;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class StyleSheet;
-            class StyleSheet$CSSStyle;
-            class StyleSheet$CSSStyleSheetParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$CSSStyleSheetParserCallback : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$CSSStyleSheetParserCallback(::javax::swing::text::html::StyleSheet *, jint);
-public:
-  virtual void startStatement(JArray< ::gnu::javax::swing::text::html::css::Selector * > *);
-  virtual void endStatement();
-  virtual void declaration(::java::lang::String *, ::java::lang::String *);
-private:
-  JArray< ::javax::swing::text::html::StyleSheet$CSSStyle * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) styles;
-  jint precedence;
-public: // actually package-private
-  ::javax::swing::text::html::StyleSheet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
diff --git a/libjava/javax/swing/text/html/StyleSheet$ListPainter.h b/libjava/javax/swing/text/html/StyleSheet$ListPainter.h
deleted file mode 100644
index d910fc0d3e6..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$ListPainter.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$ListPainter__
-#define __javax_swing_text_html_StyleSheet$ListPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class View;
-        namespace html
-        {
-            class StyleSheet;
-            class StyleSheet$ListPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$ListPainter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$ListPainter(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
-public:
-  virtual void paint(::java::awt::Graphics *, jfloat, jfloat, jfloat, jfloat, ::javax::swing::text::View *, jint);
-private:
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
-  ::javax::swing::text::html::StyleSheet * styleSheet;
-  ::java::lang::String * type;
-  ::java::awt::Rectangle * tmpRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$ListPainter__
diff --git a/libjava/javax/swing/text/html/StyleSheet.h b/libjava/javax/swing/text/html/StyleSheet.h
deleted file mode 100644
index 57ebf9e3bf9..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet__
-#define __javax_swing_text_html_StyleSheet__
-
-#pragma interface
-
-#include <javax/swing/text/StyleContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class MutableAttributeSet;
-          class Style;
-          class StyleContext$SmallAttributeSet;
-          class View;
-        namespace html
-        {
-            class CSS$Attribute;
-            class HTML$Tag;
-            class StyleSheet;
-            class StyleSheet$BoxPainter;
-            class StyleSheet$ListPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet : public ::javax::swing::text::StyleContext
-{
-
-public:
-  StyleSheet();
-  virtual ::javax::swing::text::Style * getRule(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::Element *);
-private:
-  ::javax::swing::text::Style * getResolvedStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
-  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
-  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::util::List *);
-public:
-  virtual ::javax::swing::text::Style * getRule(::java::lang::String *);
-  virtual void addRule(::java::lang::String *);
-  virtual ::javax::swing::text::AttributeSet * getDeclaration(::java::lang::String *);
-  virtual void loadRules(::java::io::Reader *, ::java::net::URL *);
-  virtual ::javax::swing::text::AttributeSet * getViewAttributes(::javax::swing::text::View *);
-  virtual void removeStyle(::java::lang::String *);
-  virtual void addStyleSheet(::javax::swing::text::html::StyleSheet *);
-  virtual void removeStyleSheet(::javax::swing::text::html::StyleSheet *);
-  virtual JArray< ::javax::swing::text::html::StyleSheet * > * getStyleSheets();
-  virtual void importStyleSheet(::java::net::URL *);
-  virtual void setBase(::java::net::URL *);
-  virtual ::java::net::URL * getBase();
-  virtual void addCSSAttribute(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
-  virtual jboolean addCSSAttributeFromHTML(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
-  virtual ::javax::swing::text::AttributeSet * translateHTMLToCSS(::javax::swing::text::AttributeSet *);
-private:
-  ::javax::swing::text::AttributeSet * translateBorder(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
-public:
-  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *);
-public: // actually protected
-  virtual ::javax::swing::text::StyleContext$SmallAttributeSet * createSmallAttributeSet(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::MutableAttributeSet * createLargeAttributeSet(::javax::swing::text::AttributeSet *);
-public:
-  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  virtual jfloat getEMBase(::javax::swing::text::AttributeSet *);
-  virtual jfloat getEXBase(::javax::swing::text::AttributeSet *);
-private:
-  jint getFontSize(::javax::swing::text::AttributeSet *);
-public:
-  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
-  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::html::StyleSheet$BoxPainter * getBoxPainter(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::html::StyleSheet$ListPainter * getListPainter(::javax::swing::text::AttributeSet *);
-  virtual void setBaseFontSize(jint);
-  virtual void setBaseFontSize(::java::lang::String *);
-  static jint getIndexOfSize(jfloat);
-  virtual jfloat getPointSize(jint);
-  virtual jfloat getPointSize(::java::lang::String *);
-  virtual ::java::awt::Color * stringToColor(::java::lang::String *);
-private:
-  ::java::util::Map * attributeSetToMap(::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::javax::swing::text::StyleContext)))) base;
-  jint baseFontSize;
-private:
-  ::java::util::ArrayList * linked;
-public: // actually package-private
-  ::java::util::ArrayList * css;
-private:
-  ::java::util::HashMap * resolvedStyles;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet__
diff --git a/libjava/javax/swing/text/html/TableView$CellView.h b/libjava/javax/swing/text/html/TableView$CellView.h
deleted file mode 100644
index c878fa60a00..00000000000
--- a/libjava/javax/swing/text/html/TableView$CellView.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_TableView$CellView__
-#define __javax_swing_text_html_TableView$CellView__
-
-#pragma interface
-
-#include <javax/swing/text/html/BlockView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class TableView;
-            class TableView$CellView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::TableView$CellView : public ::javax::swing::text::html::BlockView
-{
-
-public: // actually package-private
-  TableView$CellView(::javax::swing::text::html::TableView *, ::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void setPropertiesFromAttributes();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) colSpan;
-  jint rowSpan;
-  ::javax::swing::text::html::TableView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_TableView$CellView__
diff --git a/libjava/javax/swing/text/html/TableView$RowView.h b/libjava/javax/swing/text/html/TableView$RowView.h
deleted file mode 100644
index f031898c1c1..00000000000
--- a/libjava/javax/swing/text/html/TableView$RowView.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_TableView$RowView__
-#define __javax_swing_text_html_TableView$RowView__
-
-#pragma interface
-
-#include <javax/swing/text/html/BlockView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace text
-      {
-          class Element;
-          class View;
-        namespace html
-        {
-            class TableView;
-            class TableView$RowView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::TableView$RowView : public ::javax::swing::text::html::BlockView
-{
-
-public: // actually package-private
-  TableView$RowView(::javax::swing::text::html::TableView *, ::javax::swing::text::Element *);
-public:
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getPreferredSpan(jint);
-public: // actually protected
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-public: // actually package-private
-  JArray< jboolean > * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) overlap;
-  jint rowIndex;
-  ::javax::swing::text::html::TableView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_TableView$RowView__
diff --git a/libjava/javax/swing/text/html/TableView.h b/libjava/javax/swing/text/html/TableView.h
deleted file mode 100644
index b271a4e48ac..00000000000
--- a/libjava/javax/swing/text/html/TableView.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_TableView__
-#define __javax_swing_text_html_TableView__
-
-#pragma interface
-
-#include <javax/swing/text/html/BlockView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class View;
-          class ViewFactory;
-        namespace html
-        {
-            class StyleSheet;
-            class TableView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::TableView : public ::javax::swing::text::html::BlockView
-{
-
-public:
-  TableView(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-public: // actually protected
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-private:
-  void calculateColumnRequirements();
-  void layoutColumns(jint);
-public: // actually package-private
-  virtual void updateGrid();
-public:
-  virtual jfloat getMaximumSpan(jint);
-  virtual void setParent(::javax::swing::text::View *);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-public: // actually package-private
-  static jint access$0(::javax::swing::text::html::TableView *, jint, jint);
-private:
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) attributes;
-public: // actually package-private
-  JArray< ::javax::swing::SizeRequirements * > * columnRequirements;
-  ::javax::swing::SizeRequirements * totalColumnRequirements;
-  JArray< jint > * columnOffsets;
-  JArray< jint > * columnSpans;
-  JArray< ::gnu::javax::swing::text::html::css::Length * > * columnWidths;
-  jint numColumns;
-private:
-  ::gnu::javax::swing::text::html::css::Length * width;
-public: // actually package-private
-  jboolean gridValid;
-  jint cellSpacing;
-private:
-  ::java::awt::Rectangle * tmpRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_TableView__
diff --git a/libjava/javax/swing/text/html/ViewAttributeSet.h b/libjava/javax/swing/text/html/ViewAttributeSet.h
deleted file mode 100644
index be6ecdcba2a..00000000000
--- a/libjava/javax/swing/text/html/ViewAttributeSet.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ViewAttributeSet__
-#define __javax_swing_text_html_ViewAttributeSet__
-
-#pragma interface
-
-#include <javax/swing/text/html/MultiAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class View;
-        namespace html
-        {
-            class StyleSheet;
-            class ViewAttributeSet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ViewAttributeSet : public ::javax::swing::text::html::MultiAttributeSet
-{
-
-public: // actually package-private
-  ViewAttributeSet(::javax::swing::text::View *, ::javax::swing::text::html::StyleSheet *);
-public:
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-private:
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::html::MultiAttributeSet)))) view;
-  ::javax::swing::text::html::StyleSheet * styleSheet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ViewAttributeSet__
diff --git a/libjava/javax/swing/text/html/parser/AttributeList$1.h b/libjava/javax/swing/text/html/parser/AttributeList$1.h
deleted file mode 100644
index 64d273a8c96..00000000000
--- a/libjava/javax/swing/text/html/parser/AttributeList$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_AttributeList$1__
-#define __javax_swing_text_html_parser_AttributeList$1__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::AttributeList$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
-{
-
-public: // actually package-private
-  AttributeList$1();
-public: // actually protected
-  virtual void create();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_AttributeList$1__
diff --git a/libjava/javax/swing/text/html/parser/AttributeList.h b/libjava/javax/swing/text/html/parser/AttributeList.h
deleted file mode 100644
index b7fb6475f2e..00000000000
--- a/libjava/javax/swing/text/html/parser/AttributeList.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_AttributeList__
-#define __javax_swing_text_html_parser_AttributeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                  class gnuStringIntMapper;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::AttributeList : public ::java::lang::Object
-{
-
-public:
-  AttributeList(::java::lang::String *);
-  AttributeList(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::util::Vector *, ::javax::swing::text::html::parser::AttributeList *);
-  jint getModifier();
-  ::java::lang::String * getName();
-  ::javax::swing::text::html::parser::AttributeList * getNext();
-  jint getType();
-  ::java::lang::String * getValue();
-  ::java::util::Enumeration * getValues();
-  static jint name2type(::java::lang::String *);
-  ::java::lang::String * toString();
-  static ::java::lang::String * type2name(jint);
-private:
-  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
-  static const jlong serialVersionUID = -1361214058742015233LL;
-public:
-  ::javax::swing::text::html::parser::AttributeList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  ::java::lang::String * name;
-  ::java::lang::String * value;
-  ::java::util::Vector * values;
-  jint modifier;
-  jint type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_AttributeList__
diff --git a/libjava/javax/swing/text/html/parser/ContentModel.h b/libjava/javax/swing/text/html/parser/ContentModel.h
deleted file mode 100644
index 45f3b20b2c6..00000000000
--- a/libjava/javax/swing/text/html/parser/ContentModel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_ContentModel__
-#define __javax_swing_text_html_parser_ContentModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class ContentModel;
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::ContentModel : public ::java::lang::Object
-{
-
-public:
-  ContentModel();
-  ContentModel(::javax::swing::text::html::parser::Element *);
-  ContentModel(jint, ::javax::swing::text::html::parser::ContentModel *);
-  ContentModel(jint, ::java::lang::Object *, ::javax::swing::text::html::parser::ContentModel *);
-  void getElements(::java::util::Vector *);
-  jboolean empty();
-  ::javax::swing::text::html::parser::Element * first();
-  jboolean first(::java::lang::Object *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1130825523866321257LL;
-public:
-  ::javax::swing::text::html::parser::ContentModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  ::java::lang::Object * content;
-  jint type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_ContentModel__
diff --git a/libjava/javax/swing/text/html/parser/DTD.h b/libjava/javax/swing/text/html/parser/DTD.h
deleted file mode 100644
index f9933273e07..00000000000
--- a/libjava/javax/swing/text/html/parser/DTD.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_DTD__
-#define __javax_swing_text_html_parser_DTD__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList;
-              class ContentModel;
-              class DTD;
-              class Element;
-              class Entity;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::DTD : public ::java::lang::Object
-{
-
-public: // actually protected
-  DTD(::java::lang::String *);
-public:
-  static ::javax::swing::text::html::parser::DTD * getDTD(::java::lang::String *);
-  virtual ::javax::swing::text::html::parser::Element * getElement(::java::lang::String *);
-  virtual ::javax::swing::text::html::parser::Element * getElement(jint);
-  virtual ::javax::swing::text::html::parser::Entity * getEntity(jint);
-  virtual ::javax::swing::text::html::parser::Entity * getEntity(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::text::html::parser::Entity * defEntity(::java::lang::String *, jint, jint);
-  virtual void defineAttributes(::java::lang::String *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::Element * defineElement(::java::lang::String *, jint, jboolean, jboolean, ::javax::swing::text::html::parser::ContentModel *, ::java::util::BitSet *, ::java::util::BitSet *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::Entity * defineEntity(::java::lang::String *, jint, JArray< jchar > *);
-  static void putDTDHash(::java::lang::String *, ::javax::swing::text::html::parser::DTD *);
-  virtual void read(::java::io::DataInputStream *);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual ::javax::swing::text::html::parser::AttributeList * defAttributeList(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::ContentModel * defContentModel(jint, ::java::lang::Object *, ::javax::swing::text::html::parser::ContentModel *);
-  virtual ::javax::swing::text::html::parser::Element * defElement(::java::lang::String *, jint, jboolean, jboolean, ::javax::swing::text::html::parser::ContentModel *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::Entity * defEntity(::java::lang::String *, jint, ::java::lang::String *);
-private:
-  void assignField(::javax::swing::text::html::parser::Element *);
-  ::java::util::BitSet * bitSet(JArray< ::java::lang::String * > *);
-  ::javax::swing::text::html::parser::Element * newElement(::java::lang::String *);
-  ::javax::swing::text::html::parser::Entity * newEntity(::java::lang::String *, jint);
-  void unexpected(::java::lang::Exception *);
-public:
-  static const jint FILE_VERSION = 1;
-public: // actually package-private
-  static ::java::util::Hashtable * dtdHash;
-public:
-  ::javax::swing::text::html::parser::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) applet;
-  ::javax::swing::text::html::parser::Element * base;
-  ::javax::swing::text::html::parser::Element * body;
-  ::javax::swing::text::html::parser::Element * head;
-  ::javax::swing::text::html::parser::Element * html;
-  ::javax::swing::text::html::parser::Element * isindex;
-  ::javax::swing::text::html::parser::Element * meta;
-  ::javax::swing::text::html::parser::Element * p;
-  ::javax::swing::text::html::parser::Element * param;
-  ::javax::swing::text::html::parser::Element * pcdata;
-  ::javax::swing::text::html::parser::Element * title;
-  ::java::util::Hashtable * elementHash;
-  ::java::util::Hashtable * entityHash;
-  ::java::lang::String * name;
-  ::java::util::Vector * elements;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_DTD__
diff --git a/libjava/javax/swing/text/html/parser/DTDConstants.h b/libjava/javax/swing/text/html/parser/DTDConstants.h
deleted file mode 100644
index 7fe66c6de36..00000000000
--- a/libjava/javax/swing/text/html/parser/DTDConstants.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_DTDConstants__
-#define __javax_swing_text_html_parser_DTDConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTDConstants;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::DTDConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint CDATA = 1;
-  static const jint EMPTY = 17;
-  static const jint ID = 4;
-  static const jint IDREF = 5;
-  static const jint IDREFS = 6;
-  static const jint NAME = 7;
-  static const jint NAMES = 8;
-  static const jint NMTOKEN = 9;
-  static const jint NMTOKENS = 10;
-  static const jint NOTATION = 11;
-  static const jint NUMBER = 12;
-  static const jint NUMBERS = 13;
-  static const jint NUTOKEN = 14;
-  static const jint NUTOKENS = 15;
-  static const jint PUBLIC = 10;
-  static const jint SYSTEM = 17;
-  static const jint PARAMETER = 262144;
-  static const jint GENERAL = 65536;
-  static const jint REQUIRED = 2;
-  static const jint FIXED = 1;
-  static const jint IMPLIED = 5;
-  static const jint CURRENT = 3;
-  static const jint CONREF = 4;
-  static const jint STARTTAG = 13;
-  static const jint ENDTAG = 14;
-  static const jint ANY = 19;
-  static const jint DEFAULT = 131072;
-  static const jint ENTITIES = 3;
-  static const jint ENTITY = 2;
-  static const jint MD = 16;
-  static const jint MODEL = 18;
-  static const jint MS = 15;
-  static const jint PI = 12;
-  static const jint RCDATA = 16;
-  static const jint SDATA = 11;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_html_parser_DTDConstants__
diff --git a/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h b/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h
deleted file mode 100644
index cba941dcfe7..00000000000
--- a/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_DocumentParser$gnuParser__
-#define __javax_swing_text_html_parser_DocumentParser$gnuParser__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class DocumentParser;
-              class DocumentParser$gnuParser;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::DocumentParser$gnuParser : public ::gnu::javax::swing::text::html::parser::support::Parser
-{
-
-  DocumentParser$gnuParser(::javax::swing::text::html::parser::DocumentParser *, ::javax::swing::text::html::parser::DTD *);
-public: // actually protected
-  virtual void handleComment(JArray< jchar > *);
-  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleError(jint, ::java::lang::String *);
-  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleText(JArray< jchar > *);
-public: // actually package-private
-  virtual ::javax::swing::text::html::parser::DTD * getDTD();
-  DocumentParser$gnuParser(::javax::swing::text::html::parser::DocumentParser *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::DocumentParser$gnuParser *);
-  ::javax::swing::text::html::parser::DocumentParser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_DocumentParser$gnuParser__
diff --git a/libjava/javax/swing/text/html/parser/DocumentParser.h b/libjava/javax/swing/text/html/parser/DocumentParser.h
deleted file mode 100644
index d07191d19e5..00000000000
--- a/libjava/javax/swing/text/html/parser/DocumentParser.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_DocumentParser__
-#define __javax_swing_text_html_parser_DocumentParser__
-
-#pragma interface
-
-#include <javax/swing/text/html/parser/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTMLEditorKit$ParserCallback;
-          namespace parser
-          {
-              class DTD;
-              class DocumentParser;
-              class DocumentParser$gnuParser;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::DocumentParser : public ::javax::swing::text::html::parser::Parser
-{
-
-public:
-  DocumentParser(::javax::swing::text::html::parser::DTD *);
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean);
-public: // actually protected
-  virtual void handleComment(JArray< jchar > *);
-  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleError(jint, ::java::lang::String *);
-  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleText(JArray< jchar > *);
-public: // actually package-private
-  ::javax::swing::text::html::parser::DocumentParser * __attribute__((aligned(__alignof__( ::javax::swing::text::html::parser::Parser)))) parser;
-  ::javax::swing::text::html::HTMLEditorKit$ParserCallback * callBack;
-  ::javax::swing::text::html::parser::DocumentParser$gnuParser * gnu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_DocumentParser__
diff --git a/libjava/javax/swing/text/html/parser/Element$1.h b/libjava/javax/swing/text/html/parser/Element$1.h
deleted file mode 100644
index 159f9976fbd..00000000000
--- a/libjava/javax/swing/text/html/parser/Element$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Element$1__
-#define __javax_swing_text_html_parser_Element$1__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class Element$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Element$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
-{
-
-public: // actually package-private
-  Element$1();
-public: // actually protected
-  virtual void create();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Element$1__
diff --git a/libjava/javax/swing/text/html/parser/Element.h b/libjava/javax/swing/text/html/parser/Element.h
deleted file mode 100644
index 08bc75c7a19..00000000000
--- a/libjava/javax/swing/text/html/parser/Element.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Element__
-#define __javax_swing_text_html_parser_Element__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                  class gnuStringIntMapper;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList;
-              class ContentModel;
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Element : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Element();
-public:
-  static jint name2type(::java::lang::String *);
-  ::javax::swing::text::html::parser::AttributeList * getAttribute(::java::lang::String *);
-  ::javax::swing::text::html::parser::AttributeList * getAttributeByValue(::java::lang::String *);
-  ::javax::swing::text::html::parser::AttributeList * getAttributes();
-  ::javax::swing::text::html::parser::ContentModel * getContent();
-  jboolean isEmpty();
-  jint getIndex();
-  ::java::lang::String * getName();
-  jint getType();
-  jboolean omitEnd();
-  jboolean omitStart();
-  ::java::lang::String * toString();
-public: // actually package-private
-  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
-private:
-  static const jlong serialVersionUID = -6717939384601675586LL;
-public:
-  ::javax::swing::text::html::parser::AttributeList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) atts;
-  ::java::util::BitSet * exclusions;
-  ::java::util::BitSet * inclusions;
-  ::javax::swing::text::html::parser::ContentModel * content;
-  ::java::lang::Object * data;
-  ::java::lang::String * name;
-  jboolean oEnd;
-  jboolean oStart;
-  jint index;
-  jint type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Element__
diff --git a/libjava/javax/swing/text/html/parser/Entity$1.h b/libjava/javax/swing/text/html/parser/Entity$1.h
deleted file mode 100644
index ed86ad36eb3..00000000000
--- a/libjava/javax/swing/text/html/parser/Entity$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Entity$1__
-#define __javax_swing_text_html_parser_Entity$1__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class Entity$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Entity$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
-{
-
-public: // actually package-private
-  Entity$1();
-public: // actually protected
-  virtual void create();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Entity$1__
diff --git a/libjava/javax/swing/text/html/parser/Entity.h b/libjava/javax/swing/text/html/parser/Entity.h
deleted file mode 100644
index 2c82e3167c4..00000000000
--- a/libjava/javax/swing/text/html/parser/Entity.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Entity__
-#define __javax_swing_text_html_parser_Entity__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                  class gnuStringIntMapper;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class Entity;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Entity : public ::java::lang::Object
-{
-
-public:
-  Entity(::java::lang::String *, jint, JArray< jchar > *);
-  static jint name2type(::java::lang::String *);
-  JArray< jchar > * getData();
-  jboolean isGeneral();
-  ::java::lang::String * getName();
-  jboolean isParameter();
-  ::java::lang::String * getString();
-  jint getType();
-public: // actually package-private
-  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  JArray< jchar > * data;
-  jint type;
-private:
-  ::java::lang::String * sdata;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Entity__
diff --git a/libjava/javax/swing/text/html/parser/Parser$1.h b/libjava/javax/swing/text/html/parser/Parser$1.h
deleted file mode 100644
index fbeea85caf6..00000000000
--- a/libjava/javax/swing/text/html/parser/Parser$1.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Parser$1__
-#define __javax_swing_text_html_parser_Parser$1__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class Element;
-              class Parser;
-              class Parser$1;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Parser$1 : public ::gnu::javax::swing::text::html::parser::support::Parser
-{
-
-public: // actually package-private
-  Parser$1(::javax::swing::text::html::parser::Parser *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::Parser *);
-public: // actually protected
-  virtual void handleComment(JArray< jchar > *);
-  virtual void handleEOFInComment();
-  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleError(jint, ::java::lang::String *);
-  virtual void handleText(JArray< jchar > *);
-  virtual void handleTitle(JArray< jchar > *);
-  virtual void markFirstTime(::javax::swing::text::html::parser::Element *);
-  virtual void startTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void endTag(jboolean);
-  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *);
-  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *, jboolean);
-public: // actually package-private
-  ::javax::swing::text::html::parser::Parser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
-private:
-  ::javax::swing::text::html::parser::Parser * val$j;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Parser$1__
diff --git a/libjava/javax/swing/text/html/parser/Parser.h b/libjava/javax/swing/text/html/parser/Parser.h
deleted file mode 100644
index 5f8e0dbab4b..00000000000
--- a/libjava/javax/swing/text/html/parser/Parser.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Parser__
-#define __javax_swing_text_html_parser_Parser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-              namespace support
-              {
-                  class Parser;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class SimpleAttributeSet;
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class Element;
-              class Parser;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Parser : public ::java::lang::Object
-{
-
-public:
-  Parser(::javax::swing::text::html::parser::DTD *);
-  virtual void parse(::java::io::Reader *);
-  virtual ::java::lang::String * parseDTDMarkup();
-public: // actually protected
-  virtual jboolean parseMarkupDeclarations(::java::lang::StringBuffer *);
-  virtual ::javax::swing::text::SimpleAttributeSet * getAttributes();
-  virtual jint getCurrentLine();
-  virtual jint getCurrentPos();
-  virtual void endTag(jboolean);
-  virtual void error(::java::lang::String *);
-  virtual void error(::java::lang::String *, ::java::lang::String *);
-  virtual void error(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void error(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void flushAttributes();
-  virtual void handleComment(JArray< jchar > *);
-  virtual void handleEOFInComment();
-  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleError(jint, ::java::lang::String *);
-  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleText(JArray< jchar > *);
-  virtual void handleTitle(JArray< jchar > *);
-  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *);
-  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *, jboolean);
-  virtual void markFirstTime(::javax::swing::text::html::parser::Element *);
-  virtual void startTag(::javax::swing::text::html::parser::TagElement *);
-  ::javax::swing::text::html::parser::DTD * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dtd;
-  jboolean strict;
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::support::Parser * gnu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Parser__
diff --git a/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h b/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h
deleted file mode 100644
index fec9d39c1f2..00000000000
--- a/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_ParserDelegator$gnuParser__
-#define __javax_swing_text_html_parser_ParserDelegator$gnuParser__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class ParserDelegator;
-              class ParserDelegator$gnuParser;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::ParserDelegator$gnuParser : public ::gnu::javax::swing::text::html::parser::support::Parser
-{
-
-  ParserDelegator$gnuParser(::javax::swing::text::html::parser::ParserDelegator *, ::javax::swing::text::html::parser::DTD *);
-public: // actually protected
-  virtual void handleComment(JArray< jchar > *);
-  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleError(jint, ::java::lang::String *);
-  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  virtual void handleText(JArray< jchar > *);
-public: // actually package-private
-  virtual ::javax::swing::text::html::parser::DTD * getDTD();
-  ParserDelegator$gnuParser(::javax::swing::text::html::parser::ParserDelegator *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::ParserDelegator$gnuParser *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::text::html::parser::ParserDelegator * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_ParserDelegator$gnuParser__
diff --git a/libjava/javax/swing/text/html/parser/ParserDelegator.h b/libjava/javax/swing/text/html/parser/ParserDelegator.h
deleted file mode 100644
index b2c35297b15..00000000000
--- a/libjava/javax/swing/text/html/parser/ParserDelegator.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_ParserDelegator__
-#define __javax_swing_text_html_parser_ParserDelegator__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLEditorKit$Parser.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTMLEditorKit$ParserCallback;
-          namespace parser
-          {
-              class DTD;
-              class ParserDelegator;
-              class ParserDelegator$gnuParser;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::ParserDelegator : public ::javax::swing::text::html::HTMLEditorKit$Parser
-{
-
-public:
-  ParserDelegator();
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean);
-public: // actually protected
-  static void setDefaultDTD();
-  static ::javax::swing::text::html::parser::DTD * createDTD(::javax::swing::text::html::parser::DTD *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1276686502624777206LL;
-  static ::javax::swing::text::html::parser::DTD * dtd;
-public: // actually package-private
-  ::javax::swing::text::html::HTMLEditorKit$ParserCallback * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$Parser)))) callBack;
-  ::javax::swing::text::html::parser::ParserDelegator$gnuParser * gnu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_ParserDelegator__
diff --git a/libjava/javax/swing/text/html/parser/TagElement.h b/libjava/javax/swing/text/html/parser/TagElement.h
deleted file mode 100644
index b29cad472b5..00000000000
--- a/libjava/javax/swing/text/html/parser/TagElement.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_TagElement__
-#define __javax_swing_text_html_parser_TagElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Tag;
-          namespace parser
-          {
-              class Element;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::TagElement : public ::java::lang::Object
-{
-
-public:
-  TagElement(::javax::swing::text::html::parser::Element *);
-  TagElement(::javax::swing::text::html::parser::Element *, jboolean);
-  virtual ::javax::swing::text::html::parser::Element * getElement();
-  virtual ::javax::swing::text::html::HTML$Tag * getHTMLTag();
-  virtual jboolean isPreformatted();
-  virtual jboolean breaksFlow();
-  virtual jboolean fictional();
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::swing::text::html::parser::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) element;
-  ::javax::swing::text::html::HTML$Tag * tag;
-  jboolean fictional__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_TagElement__
diff --git a/libjava/javax/swing/text/rtf/ControlWordToken.h b/libjava/javax/swing/text/rtf/ControlWordToken.h
deleted file mode 100644
index aa6a352a4a7..00000000000
--- a/libjava/javax/swing/text/rtf/ControlWordToken.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_ControlWordToken__
-#define __javax_swing_text_rtf_ControlWordToken__
-
-#pragma interface
-
-#include <javax/swing/text/rtf/Token.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class ControlWordToken;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::ControlWordToken : public ::javax::swing::text::rtf::Token
-{
-
-public:
-  ControlWordToken(::java::lang::String *);
-  ControlWordToken(::java::lang::String *, jint);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::rtf::Token)))) name;
-  jint param;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_ControlWordToken__
diff --git a/libjava/javax/swing/text/rtf/RTFEditorKit.h b/libjava/javax/swing/text/rtf/RTFEditorKit.h
deleted file mode 100644
index 789bec142ad..00000000000
--- a/libjava/javax/swing/text/rtf/RTFEditorKit.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_RTFEditorKit__
-#define __javax_swing_text_rtf_RTFEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Document;
-        namespace rtf
-        {
-            class RTFEditorKit;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::RTFEditorKit : public ::javax::swing::text::StyledEditorKit
-{
-
-public:
-  RTFEditorKit();
-  virtual ::java::lang::String * getContentType();
-  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
-  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_RTFEditorKit__
diff --git a/libjava/javax/swing/text/rtf/RTFParseException.h b/libjava/javax/swing/text/rtf/RTFParseException.h
deleted file mode 100644
index 4c5e2b81ad2..00000000000
--- a/libjava/javax/swing/text/rtf/RTFParseException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_RTFParseException__
-#define __javax_swing_text_rtf_RTFParseException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class RTFParseException;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::RTFParseException : public ::java::lang::RuntimeException
-{
-
-public:
-  RTFParseException();
-  RTFParseException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_RTFParseException__
diff --git a/libjava/javax/swing/text/rtf/RTFParser.h b/libjava/javax/swing/text/rtf/RTFParser.h
deleted file mode 100644
index 5de9f592080..00000000000
--- a/libjava/javax/swing/text/rtf/RTFParser.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_RTFParser__
-#define __javax_swing_text_rtf_RTFParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Document;
-        namespace rtf
-        {
-            class RTFParser;
-            class RTFScanner;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::RTFParser : public ::java::lang::Object
-{
-
-  RTFParser(::javax::swing::text::Document *, jint);
-public:
-  RTFParser(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
-  RTFParser(::java::io::Reader *, ::javax::swing::text::Document *, jint);
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual void parse();
-private:
-  void parseFile();
-  void parseHeader();
-  void parseDocument();
-  ::javax::swing::text::rtf::RTFScanner * __attribute__((aligned(__alignof__( ::java::lang::Object)))) scanner;
-  ::javax::swing::text::Document * doc;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_RTFParser__
diff --git a/libjava/javax/swing/text/rtf/RTFScanner.h b/libjava/javax/swing/text/rtf/RTFScanner.h
deleted file mode 100644
index ebfd9108aa6..00000000000
--- a/libjava/javax/swing/text/rtf/RTFScanner.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_RTFScanner__
-#define __javax_swing_text_rtf_RTFScanner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class RTFScanner;
-            class Token;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::RTFScanner : public ::java::lang::Object
-{
-
-  RTFScanner();
-public:
-  RTFScanner(::java::io::InputStream *);
-  RTFScanner(::java::io::Reader *);
-private:
-  ::javax::swing::text::rtf::Token * readTokenImpl();
-public: // actually package-private
-  virtual ::javax::swing::text::rtf::Token * peekToken();
-  virtual ::javax::swing::text::rtf::Token * readToken();
-private:
-  ::javax::swing::text::rtf::Token * readControlWord();
-  ::javax::swing::text::rtf::Token * readText();
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-  ::java::lang::StringBuffer * buffer;
-  ::javax::swing::text::rtf::Token * lastToken;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_RTFScanner__
diff --git a/libjava/javax/swing/text/rtf/TextToken.h b/libjava/javax/swing/text/rtf/TextToken.h
deleted file mode 100644
index 189d22994be..00000000000
--- a/libjava/javax/swing/text/rtf/TextToken.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_TextToken__
-#define __javax_swing_text_rtf_TextToken__
-
-#pragma interface
-
-#include <javax/swing/text/rtf/Token.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class TextToken;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::TextToken : public ::javax::swing::text::rtf::Token
-{
-
-public:
-  TextToken(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::rtf::Token)))) text;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_TextToken__
diff --git a/libjava/javax/swing/text/rtf/Token.h b/libjava/javax/swing/text/rtf/Token.h
deleted file mode 100644
index bd32666bff0..00000000000
--- a/libjava/javax/swing/text/rtf/Token.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_Token__
-#define __javax_swing_text_rtf_Token__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class Token;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::Token : public ::java::lang::Object
-{
-
-public:
-  Token(jint);
-  static const jint EOF = -1;
-  static const jint LCURLY = 1;
-  static const jint RCURLY = 2;
-  static const jint CONTROL_WORD = 3;
-  static const jint TEXT = 4;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_Token__
diff --git a/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h b/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h
deleted file mode 100644
index 88eca9e7bf0..00000000000
--- a/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
-#define __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class AbstractLayoutCache$NodeDimensions;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::AbstractLayoutCache$NodeDimensions : public ::java::lang::Object
-{
-
-public:
-  AbstractLayoutCache$NodeDimensions();
-  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
diff --git a/libjava/javax/swing/tree/AbstractLayoutCache.h b/libjava/javax/swing/tree/AbstractLayoutCache.h
deleted file mode 100644
index d51c8e852d2..00000000000
--- a/libjava/javax/swing/tree/AbstractLayoutCache.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_AbstractLayoutCache__
-#define __javax_swing_tree_AbstractLayoutCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace tree
-      {
-          class AbstractLayoutCache;
-          class AbstractLayoutCache$NodeDimensions;
-          class TreeModel;
-          class TreePath;
-          class TreeSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::AbstractLayoutCache : public ::java::lang::Object
-{
-
-public:
-  AbstractLayoutCache();
-  virtual void setNodeDimensions(::javax::swing::tree::AbstractLayoutCache$NodeDimensions *);
-  virtual ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * getNodeDimensions();
-public: // actually protected
-  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *);
-public:
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual ::javax::swing::tree::TreeModel * getModel();
-  virtual void setRootVisible(jboolean);
-  virtual jboolean isRootVisible();
-  virtual void setRowHeight(jint);
-  virtual jint getRowHeight();
-  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
-  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
-  virtual jint getPreferredHeight();
-  virtual jint getPreferredWidth(::java::awt::Rectangle *);
-  virtual jboolean isExpanded(::javax::swing::tree::TreePath *) = 0;
-  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *) = 0;
-  virtual ::javax::swing::tree::TreePath * getPathForRow(jint) = 0;
-  virtual jint getRowForPath(::javax::swing::tree::TreePath *) = 0;
-  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint) = 0;
-  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *) = 0;
-  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *) = 0;
-  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean) = 0;
-  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *) = 0;
-  virtual jint getRowCount() = 0;
-  virtual void invalidateSizes() = 0;
-  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *) = 0;
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual JArray< jint > * getRowsForPaths(JArray< ::javax::swing::tree::TreePath * > *);
-public: // actually protected
-  virtual jboolean isFixedRowHeight();
-  ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodeDimensions;
-  ::javax::swing::tree::TreeModel * treeModel;
-  ::javax::swing::tree::TreeSelectionModel * treeSelectionModel;
-  jboolean rootVisible;
-  jint rowHeight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_AbstractLayoutCache__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
deleted file mode 100644
index 9c13e759163..00000000000
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
-#define __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultMutableTreeNode$BreadthFirstEnumeration;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultMutableTreeNode$BreadthFirstEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultMutableTreeNode$BreadthFirstEnumeration(::javax::swing::tree::TreeNode *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$BreadthFirstEnumeration$nextElement();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
deleted file mode 100644
index 31065d6690d..00000000000
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
-#define __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultMutableTreeNode$PostorderEnumeration;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultMutableTreeNode$PostorderEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultMutableTreeNode$PostorderEnumeration(::javax::swing::tree::TreeNode *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$PostorderEnumeration$nextElement();
-private:
-  ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
-public:
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::Stack * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodes;
-  ::java::util::Stack * childrenEnums;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
deleted file mode 100644
index 98117b06fec..00000000000
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
-#define __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultMutableTreeNode$PreorderEnumeration;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultMutableTreeNode$PreorderEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultMutableTreeNode$PreorderEnumeration(::javax::swing::tree::TreeNode *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$PreorderEnumeration$nextElement();
-private:
-  ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
-public:
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::javax::swing::tree::TreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  ::java::util::Stack * childrenEnums;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode.h b/libjava/javax/swing/tree/DefaultMutableTreeNode.h
deleted file mode 100644
index b5a46532375..00000000000
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultMutableTreeNode__
-#define __javax_swing_tree_DefaultMutableTreeNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultMutableTreeNode;
-          class MutableTreeNode;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultMutableTreeNode : public ::java::lang::Object
-{
-
-public:
-  DefaultMutableTreeNode();
-  DefaultMutableTreeNode(::java::lang::Object *);
-  DefaultMutableTreeNode(::java::lang::Object *, jboolean);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-  virtual void add(::javax::swing::tree::MutableTreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getParent();
-  virtual void remove(jint);
-  virtual void remove(::javax::swing::tree::MutableTreeNode *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual void insert(::javax::swing::tree::MutableTreeNode *, jint);
-  virtual JArray< ::javax::swing::tree::TreeNode * > * getPath();
-  virtual ::java::util::Enumeration * children();
-  virtual void setParent(::javax::swing::tree::MutableTreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
-  virtual jint getChildCount();
-  virtual jint getIndex(::javax::swing::tree::TreeNode *);
-  virtual void setAllowsChildren(jboolean);
-  virtual jboolean getAllowsChildren();
-  virtual void setUserObject(::java::lang::Object *);
-  virtual ::java::lang::Object * getUserObject();
-  virtual void removeFromParent();
-  virtual void removeAllChildren();
-  virtual jboolean isNodeAncestor(::javax::swing::tree::TreeNode *);
-  virtual jboolean isNodeDescendant(::javax::swing::tree::DefaultMutableTreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getSharedAncestor(::javax::swing::tree::DefaultMutableTreeNode *);
-  virtual jboolean isNodeRelated(::javax::swing::tree::DefaultMutableTreeNode *);
-  virtual jint getDepth();
-  virtual jint getLevel();
-public: // actually protected
-  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *, jint);
-public:
-  virtual JArray< ::java::lang::Object * > * getUserObjectPath();
-  virtual ::javax::swing::tree::TreeNode * getRoot();
-  virtual jboolean isRoot();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextNode();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousNode();
-  virtual ::java::util::Enumeration * preorderEnumeration();
-  virtual ::java::util::Enumeration * postorderEnumeration();
-  virtual ::java::util::Enumeration * breadthFirstEnumeration();
-  virtual ::java::util::Enumeration * depthFirstEnumeration();
-  virtual ::java::util::Enumeration * pathFromAncestorEnumeration(::javax::swing::tree::TreeNode *);
-  virtual jboolean isNodeChild(::javax::swing::tree::TreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getFirstChild();
-  virtual ::javax::swing::tree::TreeNode * getLastChild();
-  virtual ::javax::swing::tree::TreeNode * getChildAfter(::javax::swing::tree::TreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getChildBefore(::javax::swing::tree::TreeNode *);
-  virtual jboolean isNodeSibling(::javax::swing::tree::TreeNode *);
-  virtual jint getSiblingCount();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextSibling();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousSibling();
-  virtual jboolean isLeaf();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getFirstLeaf();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getLastLeaf();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextLeaf();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousLeaf();
-  virtual jint getLeafCount();
-private:
-  static const jlong serialVersionUID = -4298474751201349152LL;
-public:
-  static ::java::util::Enumeration * EMPTY_ENUMERATION;
-public: // actually protected
-  ::javax::swing::tree::MutableTreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-  ::java::util::Vector * children__;
-  ::java::lang::Object * userObject;
-  jboolean allowsChildren;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultMutableTreeNode__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h b/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h
deleted file mode 100644
index a09a8dcbe42..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
-#define __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace tree
-      {
-          class DefaultTreeCellEditor;
-          class DefaultTreeCellEditor$DefaultTextField;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellEditor$DefaultTextField : public ::javax::swing::JTextField
-{
-
-public:
-  DefaultTreeCellEditor$DefaultTextField(::javax::swing::tree::DefaultTreeCellEditor *, ::javax::swing::border::Border *);
-  virtual ::java::awt::Font * getFont();
-  virtual ::javax::swing::border::Border * getBorder();
-  virtual ::java::awt::Dimension * getPreferredSize();
-public: // actually package-private
-  static const jlong serialVersionUID = -6629304544265300143LL;
-public: // actually protected
-  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) border;
-public: // actually package-private
-  ::javax::swing::tree::DefaultTreeCellEditor * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h b/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h
deleted file mode 100644
index 554543398b5..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
-#define __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultTreeCellEditor;
-          class DefaultTreeCellEditor$EditorContainer;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellEditor$EditorContainer : public ::java::awt::Container
-{
-
-public:
-  DefaultTreeCellEditor$EditorContainer(::javax::swing::tree::DefaultTreeCellEditor *);
-  virtual void EditorContainer();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void doLayout();
-  virtual ::java::awt::Dimension * getPreferredSize();
-public: // actually package-private
-  static const jlong serialVersionUID = 6470339600449699810LL;
-  ::javax::swing::tree::DefaultTreeCellEditor * __attribute__((aligned(__alignof__( ::java::awt::Container)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor.h b/libjava/javax/swing/tree/DefaultTreeCellEditor.h
deleted file mode 100644
index bac3f21ad97..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellEditor__
-#define __javax_swing_tree_DefaultTreeCellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Container;
-        class Font;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JTree;
-        class Timer;
-      namespace event
-      {
-          class CellEditorListener;
-          class EventListenerList;
-          class TreeSelectionEvent;
-      }
-      namespace tree
-      {
-          class DefaultTreeCellEditor;
-          class DefaultTreeCellRenderer;
-          class TreeCellEditor;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellEditor : public ::java::lang::Object
-{
-
-public:
-  DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *);
-  DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *, ::javax::swing::tree::TreeCellEditor *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual void setBorderSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getBorderSelectionColor();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
-  virtual ::java::lang::Object * getCellEditorValue();
-  virtual jboolean isCellEditable(::java::util::EventObject *);
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-  virtual jboolean stopCellEditing();
-  virtual void cancelCellEditing();
-private:
-  void finish();
-public:
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *);
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *);
-  virtual JArray< ::javax::swing::event::CellEditorListener * > * getCellEditorListeners();
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  virtual void setTree(::javax::swing::JTree *);
-  virtual jboolean shouldStartEditingTimer(::java::util::EventObject *);
-  virtual void startEditingTimer();
-  virtual jboolean canEditImmediately(::java::util::EventObject *);
-  virtual jboolean inHitRegion(jint, jint);
-  virtual void determineOffset(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
-  virtual void prepareForEditing();
-  virtual ::java::awt::Container * createContainer();
-  virtual ::javax::swing::tree::TreeCellEditor * createTreeCellEditor();
-private:
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public: // actually protected
-  ::javax::swing::tree::TreeCellEditor * realEditor;
-  ::javax::swing::tree::DefaultTreeCellRenderer * renderer;
-  ::java::awt::Container * editingContainer;
-  ::java::awt::Component * editingComponent;
-  jboolean canEdit;
-  jint offset;
-  ::javax::swing::JTree * tree;
-  ::javax::swing::tree::TreePath * lastPath;
-  ::javax::swing::Timer * timer;
-  jint lastRow;
-  ::java::awt::Color * borderSelectionColor;
-  ::javax::swing::Icon * editingIcon;
-  ::java::awt::Font * font;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellEditor__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellRenderer.h b/libjava/javax/swing/tree/DefaultTreeCellRenderer.h
deleted file mode 100644
index 5677bad3670..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellRenderer.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellRenderer__
-#define __javax_swing_tree_DefaultTreeCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Font;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JTree;
-      namespace tree
-      {
-          class DefaultTreeCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellRenderer : public ::javax::swing::JLabel
-{
-
-public:
-  DefaultTreeCellRenderer();
-  virtual ::javax::swing::Icon * getDefaultOpenIcon();
-  virtual ::javax::swing::Icon * getDefaultClosedIcon();
-  virtual ::javax::swing::Icon * getDefaultLeafIcon();
-  virtual void setOpenIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getOpenIcon();
-  virtual void setClosedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getClosedIcon();
-  virtual void setLeafIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getLeafIcon();
-  virtual void setTextSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getTextSelectionColor();
-  virtual void setTextNonSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getTextNonSelectionColor();
-  virtual void setBackgroundSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackgroundSelectionColor();
-  virtual void setBackgroundNonSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackgroundNonSelectionColor();
-  virtual void setBorderSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getBorderSelectionColor();
-  virtual void setFont(::java::awt::Font *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Component * getTreeCellRendererComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean);
-  virtual ::java::awt::Font * getFont();
-  virtual void paint(::java::awt::Graphics *);
-private:
-  void paintFocus(::java::awt::Graphics *, jint, jint, jint, jint);
-  jint getXOffset();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void validate();
-  virtual void revalidate();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void repaint(::java::awt::Rectangle *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jbyte, jbyte);
-  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
-  virtual void firePropertyChange(::java::lang::String *, jshort, jshort);
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-  virtual void firePropertyChange(::java::lang::String *, jlong, jlong);
-  virtual void firePropertyChange(::java::lang::String *, jfloat, jfloat);
-  virtual void firePropertyChange(::java::lang::String *, jdouble, jdouble);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) selected;
-  jboolean hasFocus;
-private:
-  jboolean drawsFocusBorderAroundIcon;
-public: // actually protected
-  ::javax::swing::Icon * closedIcon;
-  ::javax::swing::Icon * leafIcon;
-  ::javax::swing::Icon * openIcon;
-  ::java::awt::Color * textSelectionColor;
-  ::java::awt::Color * textNonSelectionColor;
-  ::java::awt::Color * backgroundSelectionColor;
-  ::java::awt::Color * backgroundNonSelectionColor;
-  ::java::awt::Color * borderSelectionColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellRenderer__
diff --git a/libjava/javax/swing/tree/DefaultTreeModel.h b/libjava/javax/swing/tree/DefaultTreeModel.h
deleted file mode 100644
index 18deb18fa67..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeModel.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeModel__
-#define __javax_swing_tree_DefaultTreeModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class EventListenerList;
-          class TreeModelListener;
-      }
-      namespace tree
-      {
-          class DefaultTreeModel;
-          class MutableTreeNode;
-          class TreeNode;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeModel : public ::java::lang::Object
-{
-
-public:
-  DefaultTreeModel(::javax::swing::tree::TreeNode *);
-  DefaultTreeModel(::javax::swing::tree::TreeNode *, jboolean);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual jboolean asksAllowsChildren();
-  virtual void setAsksAllowsChildren(jboolean);
-  virtual void setRoot(::javax::swing::tree::TreeNode *);
-  virtual ::java::lang::Object * getRoot();
-  virtual jint getIndexOfChild(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getChild(::java::lang::Object *, jint);
-  virtual jint getChildCount(::java::lang::Object *);
-  virtual jboolean isLeaf(::java::lang::Object *);
-  virtual void reload();
-  virtual void reload(::javax::swing::tree::TreeNode *);
-  virtual void valueForPathChanged(::javax::swing::tree::TreePath *, ::java::lang::Object *);
-  virtual void insertNodeInto(::javax::swing::tree::MutableTreeNode *, ::javax::swing::tree::MutableTreeNode *, jint);
-  virtual void removeNodeFromParent(::javax::swing::tree::MutableTreeNode *);
-  virtual void nodeChanged(::javax::swing::tree::TreeNode *);
-  virtual void nodesWereInserted(::javax::swing::tree::TreeNode *, JArray< jint > *);
-  virtual void nodesWereRemoved(::javax::swing::tree::TreeNode *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual void nodesChanged(::javax::swing::tree::TreeNode *, JArray< jint > *);
-  virtual void nodeStructureChanged(::javax::swing::tree::TreeNode *);
-  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *);
-public: // actually protected
-  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *, jint);
-public:
-  virtual void addTreeModelListener(::javax::swing::event::TreeModelListener *);
-  virtual void removeTreeModelListener(::javax::swing::event::TreeModelListener *);
-  virtual JArray< ::javax::swing::event::TreeModelListener * > * getTreeModelListeners();
-public: // actually protected
-  virtual void fireTreeNodesChanged(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual void fireTreeNodesInserted(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual void fireTreeNodesRemoved(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual void fireTreeStructureChanged(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-public: // actually package-private
-  static const jlong serialVersionUID = -2621068368932566998LL;
-public: // actually protected
-  ::javax::swing::tree::TreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
-  ::javax::swing::event::EventListenerList * listenerList;
-  jboolean asksAllowsChildren__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeModel__
diff --git a/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h b/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h
deleted file mode 100644
index c9544bb4645..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
-#define __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultTreeSelectionModel$PathPlaceHolder;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeSelectionModel$PathPlaceHolder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultTreeSelectionModel$PathPlaceHolder(::javax::swing::tree::TreePath *, jboolean);
-  ::javax::swing::tree::TreePath * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
-  jboolean isNew;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
diff --git a/libjava/javax/swing/tree/DefaultTreeSelectionModel.h b/libjava/javax/swing/tree/DefaultTreeSelectionModel.h
deleted file mode 100644
index 07a358d1531..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeSelectionModel.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeSelectionModel__
-#define __javax_swing_tree_DefaultTreeSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListSelectionModel;
-      namespace event
-      {
-          class EventListenerList;
-          class SwingPropertyChangeSupport;
-          class TreeSelectionEvent;
-          class TreeSelectionListener;
-      }
-      namespace tree
-      {
-          class DefaultTreeSelectionModel;
-          class RowMapper;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeSelectionModel : public ::java::lang::Object
-{
-
-public:
-  DefaultTreeSelectionModel();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual void setRowMapper(::javax::swing::tree::RowMapper *);
-  virtual ::javax::swing::tree::RowMapper * getRowMapper();
-  virtual void setSelectionMode(jint);
-  virtual jint getSelectionMode();
-  virtual void setSelectionPath(::javax::swing::tree::TreePath *);
-public: // actually package-private
-  virtual jint getRow(::javax::swing::tree::TreePath *);
-public:
-  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void addSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void removeSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual ::javax::swing::tree::TreePath * getSelectionPath();
-  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths();
-  virtual jint getSelectionCount();
-  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *);
-  virtual jboolean isSelectionEmpty();
-  virtual void clearSelection();
-  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
-  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
-  virtual JArray< ::javax::swing::event::TreeSelectionListener * > * getTreeSelectionListeners();
-public: // actually protected
-  virtual void fireValueChanged(::javax::swing::event::TreeSelectionEvent *);
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< jint > * getSelectionRows();
-  virtual jint getMinSelectionRow();
-  virtual jint getMaxSelectionRow();
-  virtual jboolean isRowSelected(jint);
-  virtual void resetRowSelection();
-  virtual jint getLeadSelectionRow();
-  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath();
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-public: // actually protected
-  virtual void insureRowContinuity();
-  virtual jboolean arePathsContiguous(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual jboolean canPathsBeAdded(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual jboolean canPathsBeRemoved(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void notifyPathChange(::java::util::Vector *, ::javax::swing::tree::TreePath *);
-  virtual void updateLeadIndex();
-  virtual void insureUniqueness();
-public: // actually package-private
-  static const jlong serialVersionUID = 3288129636638950196LL;
-public:
-  static ::java::lang::String * SELECTION_MODE_PROPERTY;
-public: // actually protected
-  ::javax::swing::event::SwingPropertyChangeSupport * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeSupport;
-  JArray< ::javax::swing::tree::TreePath * > * selection;
-  ::javax::swing::event::EventListenerList * listenerList;
-  ::javax::swing::tree::RowMapper * rowMapper;
-  ::javax::swing::DefaultListSelectionModel * listSelectionModel;
-  jint selectionMode;
-  ::javax::swing::tree::TreePath * leadPath;
-  jint leadIndex;
-  jint leadRow;
-private:
-  ::java::util::HashSet * selectedPaths;
-  ::java::util::HashSet * tmpPaths;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeSelectionModel__
diff --git a/libjava/javax/swing/tree/ExpandVetoException.h b/libjava/javax/swing/tree/ExpandVetoException.h
deleted file mode 100644
index 174bcb8974d..00000000000
--- a/libjava/javax/swing/tree/ExpandVetoException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_ExpandVetoException__
-#define __javax_swing_tree_ExpandVetoException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-      }
-      namespace tree
-      {
-          class ExpandVetoException;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::ExpandVetoException : public ::java::lang::Exception
-{
-
-public:
-  ExpandVetoException(::javax::swing::event::TreeExpansionEvent *);
-  ExpandVetoException(::javax::swing::event::TreeExpansionEvent *, ::java::lang::String *);
-public: // actually protected
-  ::javax::swing::event::TreeExpansionEvent * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) event;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_ExpandVetoException__
diff --git a/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h b/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h
deleted file mode 100644
index 7d128e39621..00000000000
--- a/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
-#define __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class FixedHeightLayoutCache;
-          class FixedHeightLayoutCache$NodeRecord;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::FixedHeightLayoutCache$NodeRecord : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FixedHeightLayoutCache$NodeRecord(::javax::swing::tree::FixedHeightLayoutCache *, jint, jint, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::tree::TreePath * getPath();
-  virtual ::java::awt::Rectangle * getBounds();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) row;
-  jint depth;
-  ::java::lang::Object * parent;
-  ::java::lang::Object * node;
-  jboolean isExpanded;
-  ::java::awt::Rectangle * bounds;
-private:
-  ::javax::swing::tree::TreePath * path;
-public: // actually package-private
-  ::javax::swing::tree::FixedHeightLayoutCache * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
diff --git a/libjava/javax/swing/tree/FixedHeightLayoutCache.h b/libjava/javax/swing/tree/FixedHeightLayoutCache.h
deleted file mode 100644
index 863ccd9f06c..00000000000
--- a/libjava/javax/swing/tree/FixedHeightLayoutCache.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_FixedHeightLayoutCache__
-#define __javax_swing_tree_FixedHeightLayoutCache__
-
-#pragma interface
-
-#include <javax/swing/tree/VariableHeightLayoutCache.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace tree
-      {
-          class FixedHeightLayoutCache;
-          class TreeModel;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::FixedHeightLayoutCache : public ::javax::swing::tree::VariableHeightLayoutCache
-{
-
-public:
-  FixedHeightLayoutCache();
-  virtual jint getRowCount();
-private:
-  void update();
-  void countRows(::java::lang::Object *, ::java::lang::Object *, jint);
-public:
-  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *);
-  virtual void invalidateSizes();
-  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
-  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
-  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *);
-  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
-  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint);
-public: // actually package-private
-  virtual jint distance(::java::awt::Rectangle *, jint, jint);
-public:
-  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *);
-  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *);
-  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *);
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual void setRootVisible(jboolean);
-  virtual jint getPreferredHeight();
-  virtual jint getPreferredWidth(::java::awt::Rectangle *);
-public: // actually protected
-  virtual jboolean isFixedRowHeight();
-public: // actually package-private
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::javax::swing::tree::VariableHeightLayoutCache)))) expanded;
-  ::java::util::Hashtable * nodes;
-  ::java::util::Hashtable * row2node;
-  jboolean dirty;
-  jint totalHeight;
-  jint maximalWidth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_FixedHeightLayoutCache__
diff --git a/libjava/javax/swing/tree/MutableTreeNode.h b/libjava/javax/swing/tree/MutableTreeNode.h
deleted file mode 100644
index 221f6750dc5..00000000000
--- a/libjava/javax/swing/tree/MutableTreeNode.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_MutableTreeNode__
-#define __javax_swing_tree_MutableTreeNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class MutableTreeNode;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::MutableTreeNode : public ::java::lang::Object
-{
-
-public:
-  virtual void insert(::javax::swing::tree::MutableTreeNode *, jint) = 0;
-  virtual void remove(jint) = 0;
-  virtual void remove(::javax::swing::tree::MutableTreeNode *) = 0;
-  virtual void setUserObject(::java::lang::Object *) = 0;
-  virtual void removeFromParent() = 0;
-  virtual void setParent(::javax::swing::tree::MutableTreeNode *) = 0;
-  virtual ::javax::swing::tree::TreeNode * getParent() = 0;
-  virtual jint getIndex(::javax::swing::tree::TreeNode *) = 0;
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint) = 0;
-  virtual jint getChildCount() = 0;
-  virtual jboolean getAllowsChildren() = 0;
-  virtual jboolean isLeaf() = 0;
-  virtual ::java::util::Enumeration * children() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_MutableTreeNode__
diff --git a/libjava/javax/swing/tree/RowMapper.h b/libjava/javax/swing/tree/RowMapper.h
deleted file mode 100644
index d7310d3fcfb..00000000000
--- a/libjava/javax/swing/tree/RowMapper.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_RowMapper__
-#define __javax_swing_tree_RowMapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class RowMapper;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::RowMapper : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jint > * getRowsForPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_RowMapper__
diff --git a/libjava/javax/swing/tree/TreeCellEditor.h b/libjava/javax/swing/tree/TreeCellEditor.h
deleted file mode 100644
index 0b18ec605ba..00000000000
--- a/libjava/javax/swing/tree/TreeCellEditor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeCellEditor__
-#define __javax_swing_tree_TreeCellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-      namespace event
-      {
-          class CellEditorListener;
-      }
-      namespace tree
-      {
-          class TreeCellEditor;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeCellEditor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint) = 0;
-  virtual ::java::lang::Object * getCellEditorValue() = 0;
-  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
-  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
-  virtual jboolean stopCellEditing() = 0;
-  virtual void cancelCellEditing() = 0;
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeCellEditor__
diff --git a/libjava/javax/swing/tree/TreeCellRenderer.h b/libjava/javax/swing/tree/TreeCellRenderer.h
deleted file mode 100644
index 2043386d14d..00000000000
--- a/libjava/javax/swing/tree/TreeCellRenderer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeCellRenderer__
-#define __javax_swing_tree_TreeCellRenderer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-      namespace tree
-      {
-          class TreeCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeCellRenderer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getTreeCellRendererComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeCellRenderer__
diff --git a/libjava/javax/swing/tree/TreeModel.h b/libjava/javax/swing/tree/TreeModel.h
deleted file mode 100644
index 981d53fb5ab..00000000000
--- a/libjava/javax/swing/tree/TreeModel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeModel__
-#define __javax_swing_tree_TreeModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelListener;
-      }
-      namespace tree
-      {
-          class TreeModel;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeModel : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getRoot() = 0;
-  virtual ::java::lang::Object * getChild(::java::lang::Object *, jint) = 0;
-  virtual jint getChildCount(::java::lang::Object *) = 0;
-  virtual jboolean isLeaf(::java::lang::Object *) = 0;
-  virtual void valueForPathChanged(::javax::swing::tree::TreePath *, ::java::lang::Object *) = 0;
-  virtual jint getIndexOfChild(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void addTreeModelListener(::javax::swing::event::TreeModelListener *) = 0;
-  virtual void removeTreeModelListener(::javax::swing::event::TreeModelListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeModel__
diff --git a/libjava/javax/swing/tree/TreeNode.h b/libjava/javax/swing/tree/TreeNode.h
deleted file mode 100644
index 3307c09c68a..00000000000
--- a/libjava/javax/swing/tree/TreeNode.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeNode__
-#define __javax_swing_tree_TreeNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeNode : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::tree::TreeNode * getParent() = 0;
-  virtual jint getIndex(::javax::swing::tree::TreeNode *) = 0;
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint) = 0;
-  virtual jint getChildCount() = 0;
-  virtual jboolean getAllowsChildren() = 0;
-  virtual jboolean isLeaf() = 0;
-  virtual ::java::util::Enumeration * children() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeNode__
diff --git a/libjava/javax/swing/tree/TreePath.h b/libjava/javax/swing/tree/TreePath.h
deleted file mode 100644
index 9c99e2720ea..00000000000
--- a/libjava/javax/swing/tree/TreePath.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreePath__
-#define __javax_swing_tree_TreePath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreePath : public ::java::lang::Object
-{
-
-public:
-  TreePath(JArray< ::java::lang::Object * > *);
-  TreePath(::java::lang::Object *);
-public: // actually protected
-  TreePath(::javax::swing::tree::TreePath *, ::java::lang::Object *);
-  TreePath(JArray< ::java::lang::Object * > *, jint);
-  TreePath();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual JArray< ::java::lang::Object * > * getPath();
-  virtual ::java::lang::Object * getLastPathComponent();
-  virtual jint getPathCount();
-  virtual ::java::lang::Object * getPathComponent(jint);
-  virtual jboolean isDescendant(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * pathByAddingChild(::java::lang::Object *);
-  virtual ::javax::swing::tree::TreePath * getParentPath();
-public: // actually package-private
-  static const jlong serialVersionUID = 4380036194768077479LL;
-private:
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
-  ::javax::swing::tree::TreePath * parentPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_TreePath__
diff --git a/libjava/javax/swing/tree/TreeSelectionModel.h b/libjava/javax/swing/tree/TreeSelectionModel.h
deleted file mode 100644
index 3c0194d1808..00000000000
--- a/libjava/javax/swing/tree/TreeSelectionModel.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeSelectionModel__
-#define __javax_swing_tree_TreeSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeSelectionListener;
-      }
-      namespace tree
-      {
-          class RowMapper;
-          class TreePath;
-          class TreeSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeSelectionModel : public ::java::lang::Object
-{
-
-public:
-  virtual void setSelectionMode(jint) = 0;
-  virtual jint getSelectionMode() = 0;
-  virtual void setSelectionPath(::javax::swing::tree::TreePath *) = 0;
-  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
-  virtual void addSelectionPath(::javax::swing::tree::TreePath *) = 0;
-  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
-  virtual void removeSelectionPath(::javax::swing::tree::TreePath *) = 0;
-  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
-  virtual ::javax::swing::tree::TreePath * getSelectionPath() = 0;
-  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths() = 0;
-  virtual jint getSelectionCount() = 0;
-  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *) = 0;
-  virtual jboolean isSelectionEmpty() = 0;
-  virtual void clearSelection() = 0;
-  virtual void setRowMapper(::javax::swing::tree::RowMapper *) = 0;
-  virtual ::javax::swing::tree::RowMapper * getRowMapper() = 0;
-  virtual JArray< jint > * getSelectionRows() = 0;
-  virtual jint getMinSelectionRow() = 0;
-  virtual jint getMaxSelectionRow() = 0;
-  virtual jboolean isRowSelected(jint) = 0;
-  virtual void resetRowSelection() = 0;
-  virtual jint getLeadSelectionRow() = 0;
-  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath() = 0;
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *) = 0;
-  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *) = 0;
-  static const jint SINGLE_TREE_SELECTION = 1;
-  static const jint CONTIGUOUS_TREE_SELECTION = 2;
-  static const jint DISCONTIGUOUS_TREE_SELECTION = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeSelectionModel__
diff --git a/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h b/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h
deleted file mode 100644
index 1555726c9ef..00000000000
--- a/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
-#define __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class TreePath;
-          class VariableHeightLayoutCache;
-          class VariableHeightLayoutCache$NodeRecord;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::VariableHeightLayoutCache$NodeRecord : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VariableHeightLayoutCache$NodeRecord(::javax::swing::tree::VariableHeightLayoutCache *, jint, jint, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::tree::TreePath * getPath();
-  virtual ::java::awt::Rectangle * getBounds();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) row;
-  jint depth;
-  ::java::lang::Object * parent;
-  ::java::lang::Object * node;
-  jboolean isExpanded;
-  ::java::awt::Rectangle * bounds;
-private:
-  ::javax::swing::tree::TreePath * path;
-public: // actually package-private
-  ::javax::swing::tree::VariableHeightLayoutCache * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
diff --git a/libjava/javax/swing/tree/VariableHeightLayoutCache.h b/libjava/javax/swing/tree/VariableHeightLayoutCache.h
deleted file mode 100644
index 81a85bad41f..00000000000
--- a/libjava/javax/swing/tree/VariableHeightLayoutCache.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_VariableHeightLayoutCache__
-#define __javax_swing_tree_VariableHeightLayoutCache__
-
-#pragma interface
-
-#include <javax/swing/tree/AbstractLayoutCache.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace tree
-      {
-          class AbstractLayoutCache$NodeDimensions;
-          class TreeModel;
-          class TreePath;
-          class VariableHeightLayoutCache;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::VariableHeightLayoutCache : public ::javax::swing::tree::AbstractLayoutCache
-{
-
-public:
-  VariableHeightLayoutCache();
-  virtual jint getRowCount();
-private:
-  void update();
-  jint countRows(::java::lang::Object *, ::java::lang::Object *, jint, jint);
-public:
-  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *);
-  virtual void invalidateSizes();
-  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
-  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
-  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *);
-  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
-  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint);
-public: // actually package-private
-  virtual jint distance(::java::awt::Rectangle *, jint, jint);
-public:
-  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *);
-  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *);
-  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *);
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual void setRootVisible(jboolean);
-  virtual jint getPreferredHeight();
-  virtual jint getPreferredWidth(::java::awt::Rectangle *);
-  virtual void setNodeDimensions(::javax::swing::tree::AbstractLayoutCache$NodeDimensions *);
-  virtual void setRowHeight(jint);
-private:
-  static ::java::awt::Rectangle * RECT_CACHE;
-public: // actually package-private
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::javax::swing::tree::AbstractLayoutCache)))) expanded;
-  ::java::util::Hashtable * nodes;
-  ::java::util::ArrayList * row2node;
-  jboolean dirty;
-  jint totalHeight;
-  jint maximalWidth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_VariableHeightLayoutCache__
diff --git a/libjava/javax/swing/undo/AbstractUndoableEdit.h b/libjava/javax/swing/undo/AbstractUndoableEdit.h
deleted file mode 100644
index e800a690fe4..00000000000
--- a/libjava/javax/swing/undo/AbstractUndoableEdit.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_AbstractUndoableEdit__
-#define __javax_swing_undo_AbstractUndoableEdit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class AbstractUndoableEdit;
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::AbstractUndoableEdit : public ::java::lang::Object
-{
-
-public:
-  AbstractUndoableEdit();
-  virtual void undo();
-  virtual jboolean canUndo();
-  virtual void redo();
-  virtual jboolean canRedo();
-  virtual void die();
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
-  virtual jboolean replaceEdit(::javax::swing::undo::UndoableEdit *);
-  virtual jboolean isSignificant();
-  virtual ::java::lang::String * getPresentationName();
-  virtual ::java::lang::String * getUndoPresentationName();
-  virtual ::java::lang::String * getRedoPresentationName();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 580150227676302096LL;
-public: // actually protected
-  static ::java::lang::String * UndoName;
-  static ::java::lang::String * RedoName;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) hasBeenDone;
-  jboolean alive;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_AbstractUndoableEdit__
diff --git a/libjava/javax/swing/undo/CannotRedoException.h b/libjava/javax/swing/undo/CannotRedoException.h
deleted file mode 100644
index 5d20d8d7a4c..00000000000
--- a/libjava/javax/swing/undo/CannotRedoException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_CannotRedoException__
-#define __javax_swing_undo_CannotRedoException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class CannotRedoException;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::CannotRedoException : public ::java::lang::RuntimeException
-{
-
-public:
-  CannotRedoException();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_CannotRedoException__
diff --git a/libjava/javax/swing/undo/CannotUndoException.h b/libjava/javax/swing/undo/CannotUndoException.h
deleted file mode 100644
index d7a3cb2c2e8..00000000000
--- a/libjava/javax/swing/undo/CannotUndoException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_CannotUndoException__
-#define __javax_swing_undo_CannotUndoException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class CannotUndoException;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::CannotUndoException : public ::java::lang::RuntimeException
-{
-
-public:
-  CannotUndoException();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_CannotUndoException__
diff --git a/libjava/javax/swing/undo/CompoundEdit.h b/libjava/javax/swing/undo/CompoundEdit.h
deleted file mode 100644
index 9c890538421..00000000000
--- a/libjava/javax/swing/undo/CompoundEdit.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_CompoundEdit__
-#define __javax_swing_undo_CompoundEdit__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class CompoundEdit;
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::CompoundEdit : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  CompoundEdit();
-  virtual void undo();
-  virtual void redo();
-public: // actually protected
-  virtual ::javax::swing::undo::UndoableEdit * lastEdit();
-public:
-  virtual void die();
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
-  virtual void end();
-  virtual jboolean canUndo();
-  virtual jboolean canRedo();
-  virtual jboolean isInProgress();
-  virtual jboolean isSignificant();
-  virtual ::java::lang::String * getPresentationName();
-  virtual ::java::lang::String * getUndoPresentationName();
-  virtual ::java::lang::String * getRedoPresentationName();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6512679249930119683LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) edits;
-private:
-  jboolean inProgress;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_CompoundEdit__
diff --git a/libjava/javax/swing/undo/StateEdit.h b/libjava/javax/swing/undo/StateEdit.h
deleted file mode 100644
index 80c91588e4c..00000000000
--- a/libjava/javax/swing/undo/StateEdit.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_StateEdit__
-#define __javax_swing_undo_StateEdit__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class StateEdit;
-          class StateEditable;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::StateEdit : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  StateEdit(::javax::swing::undo::StateEditable *);
-  StateEdit(::javax::swing::undo::StateEditable *, ::java::lang::String *);
-public: // actually protected
-  virtual void init(::javax::swing::undo::StateEditable *, ::java::lang::String *);
-public:
-  virtual void end();
-  virtual void undo();
-  virtual void redo();
-  virtual ::java::lang::String * getPresentationName();
-public: // actually protected
-  virtual void removeRedundantState();
-  static ::java::lang::String * RCSID;
-  ::javax::swing::undo::StateEditable * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) object;
-  ::java::util::Hashtable * preState;
-  ::java::util::Hashtable * postState;
-  ::java::lang::String * undoRedoName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_StateEdit__
diff --git a/libjava/javax/swing/undo/StateEditable.h b/libjava/javax/swing/undo/StateEditable.h
deleted file mode 100644
index 0f1343ab8d0..00000000000
--- a/libjava/javax/swing/undo/StateEditable.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_StateEditable__
-#define __javax_swing_undo_StateEditable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class StateEditable;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::StateEditable : public ::java::lang::Object
-{
-
-public:
-  virtual void restoreState(::java::util::Hashtable *) = 0;
-  virtual void storeState(::java::util::Hashtable *) = 0;
-  static ::java::lang::String * RCSID;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_undo_StateEditable__
diff --git a/libjava/javax/swing/undo/UndoManager.h b/libjava/javax/swing/undo/UndoManager.h
deleted file mode 100644
index 9189c1c0bcf..00000000000
--- a/libjava/javax/swing/undo/UndoManager.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_UndoManager__
-#define __javax_swing_undo_UndoManager__
-
-#pragma interface
-
-#include <javax/swing/undo/CompoundEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class UndoableEditEvent;
-      }
-      namespace undo
-      {
-          class UndoManager;
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::UndoManager : public ::javax::swing::undo::CompoundEdit
-{
-
-public:
-  UndoManager();
-  virtual ::java::lang::String * toString();
-  virtual void end();
-  virtual jint getLimit();
-  virtual void setLimit(jint);
-  virtual void discardAllEdits();
-public: // actually protected
-  virtual void trimForLimit();
-  virtual void trimEdits(jint, jint);
-  virtual ::javax::swing::undo::UndoableEdit * editToBeUndone();
-  virtual ::javax::swing::undo::UndoableEdit * editToBeRedone();
-  virtual void undoTo(::javax::swing::undo::UndoableEdit *);
-  virtual void redoTo(::javax::swing::undo::UndoableEdit *);
-public:
-  virtual void undoOrRedo();
-  virtual jboolean canUndoOrRedo();
-  virtual void undo();
-  virtual jboolean canUndo();
-  virtual void redo();
-  virtual jboolean canRedo();
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
-  virtual ::java::lang::String * getUndoOrRedoPresentationName();
-  virtual ::java::lang::String * getUndoPresentationName();
-  virtual ::java::lang::String * getRedoPresentationName();
-  virtual void undoableEditHappened(::javax::swing::event::UndoableEditEvent *);
-public: // actually package-private
-  static const jlong serialVersionUID = -2077529998244066750LL;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::CompoundEdit)))) indexOfNextAdd;
-  jint limit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_UndoManager__
diff --git a/libjava/javax/swing/undo/UndoableEdit.h b/libjava/javax/swing/undo/UndoableEdit.h
deleted file mode 100644
index 59b73543dc8..00000000000
--- a/libjava/javax/swing/undo/UndoableEdit.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_UndoableEdit__
-#define __javax_swing_undo_UndoableEdit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::UndoableEdit : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *) = 0;
-  virtual jboolean canRedo() = 0;
-  virtual jboolean canUndo() = 0;
-  virtual void die() = 0;
-  virtual ::java::lang::String * getPresentationName() = 0;
-  virtual ::java::lang::String * getRedoPresentationName() = 0;
-  virtual ::java::lang::String * getUndoPresentationName() = 0;
-  virtual jboolean isSignificant() = 0;
-  virtual void redo() = 0;
-  virtual jboolean replaceEdit(::javax::swing::undo::UndoableEdit *) = 0;
-  virtual void undo() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_undo_UndoableEdit__
diff --git a/libjava/javax/swing/undo/UndoableEditSupport.h b/libjava/javax/swing/undo/UndoableEditSupport.h
deleted file mode 100644
index 3bfbe30b755..00000000000
--- a/libjava/javax/swing/undo/UndoableEditSupport.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_UndoableEditSupport__
-#define __javax_swing_undo_UndoableEditSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class UndoableEditListener;
-      }
-      namespace undo
-      {
-          class CompoundEdit;
-          class UndoableEdit;
-          class UndoableEditSupport;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::UndoableEditSupport : public ::java::lang::Object
-{
-
-public:
-  UndoableEditSupport();
-  UndoableEditSupport(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *);
-  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *);
-  virtual JArray< ::javax::swing::event::UndoableEditListener * > * getUndoableEditListeners();
-public: // actually protected
-  virtual void _postEdit(::javax::swing::undo::UndoableEdit *);
-public:
-  virtual void postEdit(::javax::swing::undo::UndoableEdit *);
-  virtual jint getUpdateLevel();
-  virtual void beginUpdate();
-public: // actually protected
-  virtual ::javax::swing::undo::CompoundEdit * createCompoundEdit();
-public:
-  virtual void endUpdate();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) updateLevel;
-  ::javax::swing::undo::CompoundEdit * compoundEdit;
-  ::java::util::Vector * listeners;
-  ::java::lang::Object * realSource;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_UndoableEditSupport__
diff --git a/libjava/javax/tools/Diagnostic$Kind.h b/libjava/javax/tools/Diagnostic$Kind.h
deleted file mode 100644
index 006ed7d91d4..00000000000
--- a/libjava/javax/tools/Diagnostic$Kind.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_tools_Diagnostic$Kind__
-#define __javax_tools_Diagnostic$Kind__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace tools
-    {
-        class Diagnostic$Kind;
-    }
-  }
-}
-
-class javax::tools::Diagnostic$Kind : public ::java::lang::Enum
-{
-
-  Diagnostic$Kind(::java::lang::String *, jint);
-public:
-  static JArray< ::javax::tools::Diagnostic$Kind * > * values();
-  static ::javax::tools::Diagnostic$Kind * valueOf(::java::lang::String *);
-  static ::javax::tools::Diagnostic$Kind * ERROR;
-  static ::javax::tools::Diagnostic$Kind * WARNING;
-  static ::javax::tools::Diagnostic$Kind * MANDATORY_WARNING;
-  static ::javax::tools::Diagnostic$Kind * NOTE;
-  static ::javax::tools::Diagnostic$Kind * OTHER;
-private:
-  static JArray< ::javax::tools::Diagnostic$Kind * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_tools_Diagnostic$Kind__
diff --git a/libjava/javax/tools/Diagnostic.h b/libjava/javax/tools/Diagnostic.h
deleted file mode 100644
index 540da44e55a..00000000000
--- a/libjava/javax/tools/Diagnostic.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_tools_Diagnostic__
-#define __javax_tools_Diagnostic__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace tools
-    {
-        class Diagnostic;
-        class Diagnostic$Kind;
-    }
-  }
-}
-
-class javax::tools::Diagnostic : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::tools::Diagnostic$Kind * getKind() = 0;
-  virtual ::java::lang::Object * getSource() = 0;
-  virtual jlong getPosition() = 0;
-  virtual jlong getStartPosition() = 0;
-  virtual jlong getEndPosition() = 0;
-  virtual jlong getLineNumber() = 0;
-  virtual jlong getColumnNumber() = 0;
-  virtual ::java::lang::String * getCode() = 0;
-  virtual ::java::lang::String * getMessage(::java::util::Locale *) = 0;
-  static const jlong NOPOS = -1LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_tools_Diagnostic__
diff --git a/libjava/javax/tools/DiagnosticListener.h b/libjava/javax/tools/DiagnosticListener.h
deleted file mode 100644
index a0d1a3763bd..00000000000
--- a/libjava/javax/tools/DiagnosticListener.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_tools_DiagnosticListener__
-#define __javax_tools_DiagnosticListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace tools
-    {
-        class Diagnostic;
-        class DiagnosticListener;
-    }
-  }
-}
-
-class javax::tools::DiagnosticListener : public ::java::lang::Object
-{
-
-public:
-  virtual void report(::javax::tools::Diagnostic *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_tools_DiagnosticListener__
diff --git a/libjava/javax/tools/FileObject.h b/libjava/javax/tools/FileObject.h
deleted file mode 100644
index c882240b093..00000000000
--- a/libjava/javax/tools/FileObject.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_tools_FileObject__
-#define __javax_tools_FileObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace tools
-    {
-        class FileObject;
-    }
-  }
-}
-
-class javax::tools::FileObject : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::net::URI * toUri() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::io::InputStream * openInputStream() = 0;
-  virtual ::java::io::OutputStream * openOutputStream() = 0;
-  virtual ::java::io::Reader * openReader(jboolean) = 0;
-  virtual ::java::lang::CharSequence * getCharContent(jboolean) = 0;
-  virtual ::java::io::Writer * openWriter() = 0;
-  virtual jlong getLastModified() = 0;
-  virtual jboolean delete$() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_tools_FileObject__
diff --git a/libjava/javax/transaction/HeuristicCommitException.h b/libjava/javax/transaction/HeuristicCommitException.h
deleted file mode 100644
index f73ec07291e..00000000000
--- a/libjava/javax/transaction/HeuristicCommitException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_HeuristicCommitException__
-#define __javax_transaction_HeuristicCommitException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class HeuristicCommitException;
-    }
-  }
-}
-
-class javax::transaction::HeuristicCommitException : public ::java::lang::Exception
-{
-
-public:
-  HeuristicCommitException();
-  HeuristicCommitException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_HeuristicCommitException__
diff --git a/libjava/javax/transaction/HeuristicMixedException.h b/libjava/javax/transaction/HeuristicMixedException.h
deleted file mode 100644
index 22128f20072..00000000000
--- a/libjava/javax/transaction/HeuristicMixedException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_HeuristicMixedException__
-#define __javax_transaction_HeuristicMixedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class HeuristicMixedException;
-    }
-  }
-}
-
-class javax::transaction::HeuristicMixedException : public ::java::lang::Exception
-{
-
-public:
-  HeuristicMixedException();
-  HeuristicMixedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_HeuristicMixedException__
diff --git a/libjava/javax/transaction/HeuristicRollbackException.h b/libjava/javax/transaction/HeuristicRollbackException.h
deleted file mode 100644
index c738e94e801..00000000000
--- a/libjava/javax/transaction/HeuristicRollbackException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_HeuristicRollbackException__
-#define __javax_transaction_HeuristicRollbackException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class HeuristicRollbackException;
-    }
-  }
-}
-
-class javax::transaction::HeuristicRollbackException : public ::java::lang::Exception
-{
-
-public:
-  HeuristicRollbackException();
-  HeuristicRollbackException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_HeuristicRollbackException__
diff --git a/libjava/javax/transaction/InvalidTransactionException.h b/libjava/javax/transaction/InvalidTransactionException.h
deleted file mode 100644
index 16850035410..00000000000
--- a/libjava/javax/transaction/InvalidTransactionException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_InvalidTransactionException__
-#define __javax_transaction_InvalidTransactionException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class InvalidTransactionException;
-    }
-  }
-}
-
-class javax::transaction::InvalidTransactionException : public ::java::rmi::RemoteException
-{
-
-public:
-  InvalidTransactionException();
-  InvalidTransactionException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_InvalidTransactionException__
diff --git a/libjava/javax/transaction/NotSupportedException.h b/libjava/javax/transaction/NotSupportedException.h
deleted file mode 100644
index 3737e6d46e2..00000000000
--- a/libjava/javax/transaction/NotSupportedException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_NotSupportedException__
-#define __javax_transaction_NotSupportedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class NotSupportedException;
-    }
-  }
-}
-
-class javax::transaction::NotSupportedException : public ::java::lang::Exception
-{
-
-public:
-  NotSupportedException();
-  NotSupportedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_NotSupportedException__
diff --git a/libjava/javax/transaction/RollbackException.h b/libjava/javax/transaction/RollbackException.h
deleted file mode 100644
index 396e6785cff..00000000000
--- a/libjava/javax/transaction/RollbackException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_RollbackException__
-#define __javax_transaction_RollbackException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class RollbackException;
-    }
-  }
-}
-
-class javax::transaction::RollbackException : public ::java::lang::Exception
-{
-
-public:
-  RollbackException();
-  RollbackException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_RollbackException__
diff --git a/libjava/javax/transaction/Status.h b/libjava/javax/transaction/Status.h
deleted file mode 100644
index 4fd94ac3806..00000000000
--- a/libjava/javax/transaction/Status.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_Status__
-#define __javax_transaction_Status__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class Status;
-    }
-  }
-}
-
-class javax::transaction::Status : public ::java::lang::Object
-{
-
-public:
-  static const jint STATUS_ACTIVE = 0;
-  static const jint STATUS_MARKED_ROLLBACK = 1;
-  static const jint STATUS_PREPARED = 2;
-  static const jint STATUS_COMMITTED = 3;
-  static const jint STATUS_ROLLEDBACK = 4;
-  static const jint STATUS_UNKNOWN = 5;
-  static const jint STATUS_NO_TRANSACTION = 6;
-  static const jint STATUS_PREPARING = 7;
-  static const jint STATUS_COMMITTING = 8;
-  static const jint STATUS_ROLLING_BACK = 9;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_Status__
diff --git a/libjava/javax/transaction/Synchronization.h b/libjava/javax/transaction/Synchronization.h
deleted file mode 100644
index a1572249a56..00000000000
--- a/libjava/javax/transaction/Synchronization.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_Synchronization__
-#define __javax_transaction_Synchronization__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class Synchronization;
-    }
-  }
-}
-
-class javax::transaction::Synchronization : public ::java::lang::Object
-{
-
-public:
-  virtual void beforeCompletion() = 0;
-  virtual void afterCompletion(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_Synchronization__
diff --git a/libjava/javax/transaction/SystemException.h b/libjava/javax/transaction/SystemException.h
deleted file mode 100644
index 039cc50e0ee..00000000000
--- a/libjava/javax/transaction/SystemException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_SystemException__
-#define __javax_transaction_SystemException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class SystemException;
-    }
-  }
-}
-
-class javax::transaction::SystemException : public ::java::lang::Exception
-{
-
-public:
-  SystemException();
-  SystemException(::java::lang::String *);
-  SystemException(jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) errorCode;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_SystemException__
diff --git a/libjava/javax/transaction/Transaction.h b/libjava/javax/transaction/Transaction.h
deleted file mode 100644
index 7edbc9dc706..00000000000
--- a/libjava/javax/transaction/Transaction.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_Transaction__
-#define __javax_transaction_Transaction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class Synchronization;
-        class Transaction;
-      namespace xa
-      {
-          class XAResource;
-      }
-    }
-  }
-}
-
-class javax::transaction::Transaction : public ::java::lang::Object
-{
-
-public:
-  virtual void commit() = 0;
-  virtual jboolean delistResource(::javax::transaction::xa::XAResource *, jint) = 0;
-  virtual jboolean enlistResource(::javax::transaction::xa::XAResource *) = 0;
-  virtual jint getStatus() = 0;
-  virtual void registerSynchronization(::javax::transaction::Synchronization *) = 0;
-  virtual void rollback() = 0;
-  virtual void setRollbackOnly() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_Transaction__
diff --git a/libjava/javax/transaction/TransactionManager.h b/libjava/javax/transaction/TransactionManager.h
deleted file mode 100644
index bb5df958b85..00000000000
--- a/libjava/javax/transaction/TransactionManager.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_TransactionManager__
-#define __javax_transaction_TransactionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class Transaction;
-        class TransactionManager;
-    }
-  }
-}
-
-class javax::transaction::TransactionManager : public ::java::lang::Object
-{
-
-public:
-  virtual void begin() = 0;
-  virtual void commit() = 0;
-  virtual jint getStatus() = 0;
-  virtual ::javax::transaction::Transaction * getTransaction() = 0;
-  virtual void resume(::javax::transaction::Transaction *) = 0;
-  virtual void rollback() = 0;
-  virtual void setRollbackOnly() = 0;
-  virtual void setTransactionTimeout(jint) = 0;
-  virtual ::javax::transaction::Transaction * suspend() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_TransactionManager__
diff --git a/libjava/javax/transaction/TransactionRequiredException.h b/libjava/javax/transaction/TransactionRequiredException.h
deleted file mode 100644
index 4b6aad1de59..00000000000
--- a/libjava/javax/transaction/TransactionRequiredException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_TransactionRequiredException__
-#define __javax_transaction_TransactionRequiredException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class TransactionRequiredException;
-    }
-  }
-}
-
-class javax::transaction::TransactionRequiredException : public ::java::rmi::RemoteException
-{
-
-public:
-  TransactionRequiredException();
-  TransactionRequiredException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_TransactionRequiredException__
diff --git a/libjava/javax/transaction/TransactionRolledbackException.h b/libjava/javax/transaction/TransactionRolledbackException.h
deleted file mode 100644
index 1a13227e292..00000000000
--- a/libjava/javax/transaction/TransactionRolledbackException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_TransactionRolledbackException__
-#define __javax_transaction_TransactionRolledbackException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class TransactionRolledbackException;
-    }
-  }
-}
-
-class javax::transaction::TransactionRolledbackException : public ::java::rmi::RemoteException
-{
-
-public:
-  TransactionRolledbackException();
-  TransactionRolledbackException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_TransactionRolledbackException__
diff --git a/libjava/javax/transaction/UserTransaction.h b/libjava/javax/transaction/UserTransaction.h
deleted file mode 100644
index f1c4e7def9a..00000000000
--- a/libjava/javax/transaction/UserTransaction.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_UserTransaction__
-#define __javax_transaction_UserTransaction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class UserTransaction;
-    }
-  }
-}
-
-class javax::transaction::UserTransaction : public ::java::lang::Object
-{
-
-public:
-  virtual void begin() = 0;
-  virtual void commit() = 0;
-  virtual void rollback() = 0;
-  virtual void setRollbackOnly() = 0;
-  virtual jint getStatus() = 0;
-  virtual void setTransactionTimeout(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_UserTransaction__
diff --git a/libjava/javax/transaction/xa/XAException.h b/libjava/javax/transaction/xa/XAException.h
deleted file mode 100644
index b6f590b5593..00000000000
--- a/libjava/javax/transaction/xa/XAException.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_xa_XAException__
-#define __javax_transaction_xa_XAException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-      namespace xa
-      {
-          class XAException;
-      }
-    }
-  }
-}
-
-class javax::transaction::xa::XAException : public ::java::lang::Exception
-{
-
-public:
-  XAException();
-  XAException(::java::lang::String *);
-  XAException(jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) errorCode;
-  static const jint XA_RBBASE = 100;
-  static const jint XA_RBROLLBACK = 100;
-  static const jint XA_RBCOMMFAIL = 101;
-  static const jint XA_RBDEADLOCK = 102;
-  static const jint XA_RBINTEGRITY = 103;
-  static const jint XA_RBOTHER = 104;
-  static const jint XA_RBPROTO = 105;
-  static const jint XA_RBTIMEOUT = 106;
-  static const jint XA_RBTRANSIENT = 107;
-  static const jint XA_RBEND = 107;
-  static const jint XA_NOMIGRATE = 9;
-  static const jint XA_HEURHAZ = 8;
-  static const jint XA_HEURCOM = 7;
-  static const jint XA_HEURRB = 6;
-  static const jint XA_HEURMIX = 5;
-  static const jint XA_RETRY = 4;
-  static const jint XA_RDONLY = 3;
-  static const jint XAER_ASYNC = -2;
-  static const jint XAER_RMERR = -3;
-  static const jint XAER_NOTA = -4;
-  static const jint XAER_INVAL = -5;
-  static const jint XAER_PROTO = -6;
-  static const jint XAER_RMFAIL = -7;
-  static const jint XAER_DUPID = -8;
-  static const jint XAER_OUTSIDE = -9;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_xa_XAException__
diff --git a/libjava/javax/transaction/xa/XAResource.h b/libjava/javax/transaction/xa/XAResource.h
deleted file mode 100644
index 2a5442dd945..00000000000
--- a/libjava/javax/transaction/xa/XAResource.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_xa_XAResource__
-#define __javax_transaction_xa_XAResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-      namespace xa
-      {
-          class XAResource;
-          class Xid;
-      }
-    }
-  }
-}
-
-class javax::transaction::xa::XAResource : public ::java::lang::Object
-{
-
-public:
-  virtual void commit(::javax::transaction::xa::Xid *, jboolean) = 0;
-  virtual void end(::javax::transaction::xa::Xid *, jint) = 0;
-  virtual void forget(::javax::transaction::xa::Xid *) = 0;
-  virtual jint getTransactionTimeout() = 0;
-  virtual jboolean isSameRM(::javax::transaction::xa::XAResource *) = 0;
-  virtual jint prepare(::javax::transaction::xa::Xid *) = 0;
-  virtual JArray< ::javax::transaction::xa::Xid * > * recover(jint) = 0;
-  virtual void rollback(::javax::transaction::xa::Xid *) = 0;
-  virtual jboolean setTransactionTimeout(jint) = 0;
-  virtual void start(::javax::transaction::xa::Xid *, jint) = 0;
-  static const jint TMENDRSCAN = 8388608;
-  static const jint TMFAIL = 536870912;
-  static const jint TMJOIN = 2097152;
-  static const jint TMNOFLAGS = 0;
-  static const jint TMONEPHASE = 1073741824;
-  static const jint TMRESUME = 134217728;
-  static const jint TMSTARTRSCAN = 16777216;
-  static const jint TMSUCCESS = 67108864;
-  static const jint TMSUSPEND = 33554432;
-  static const jint XA_RDONLY = 3;
-  static const jint XA_OK = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_xa_XAResource__
diff --git a/libjava/javax/transaction/xa/Xid.h b/libjava/javax/transaction/xa/Xid.h
deleted file mode 100644
index 7a4b3000107..00000000000
--- a/libjava/javax/transaction/xa/Xid.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_xa_Xid__
-#define __javax_transaction_xa_Xid__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-      namespace xa
-      {
-          class Xid;
-      }
-    }
-  }
-}
-
-class javax::transaction::xa::Xid : public ::java::lang::Object
-{
-
-public:
-  virtual jint getFormatId() = 0;
-  virtual JArray< jbyte > * getGlobalTransactionId() = 0;
-  virtual JArray< jbyte > * getBranchQualifier() = 0;
-  static const jint MAXGTRIDSIZE = 64;
-  static const jint MAXBQUALSIZE = 64;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_xa_Xid__
diff --git a/libjava/javax/xml/XMLConstants.h b/libjava/javax/xml/XMLConstants.h
deleted file mode 100644
index 16f6f1cea80..00000000000
--- a/libjava/javax/xml/XMLConstants.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_XMLConstants__
-#define __javax_xml_XMLConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-        class XMLConstants;
-    }
-  }
-}
-
-class javax::xml::XMLConstants : public ::java::lang::Object
-{
-
-  XMLConstants();
-public:
-  static ::java::lang::String * NULL_NS_URI;
-  static ::java::lang::String * DEFAULT_NS_PREFIX;
-  static ::java::lang::String * XML_NS_URI;
-  static ::java::lang::String * XML_NS_PREFIX;
-  static ::java::lang::String * XMLNS_ATTRIBUTE_NS_URI;
-  static ::java::lang::String * XMLNS_ATTRIBUTE;
-  static ::java::lang::String * W3C_XML_SCHEMA_NS_URI;
-  static ::java::lang::String * W3C_XML_SCHEMA_INSTANCE_NS_URI;
-  static ::java::lang::String * W3C_XPATH_DATATYPE_NS_URI;
-  static ::java::lang::String * XML_DTD_NS_URI;
-  static ::java::lang::String * RELAXNG_NS_URI;
-  static ::java::lang::String * FEATURE_SECURE_PROCESSING;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_XMLConstants__
diff --git a/libjava/javax/xml/datatype/DatatypeConfigurationException.h b/libjava/javax/xml/datatype/DatatypeConfigurationException.h
deleted file mode 100644
index d2623a09d94..00000000000
--- a/libjava/javax/xml/datatype/DatatypeConfigurationException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_DatatypeConfigurationException__
-#define __javax_xml_datatype_DatatypeConfigurationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeConfigurationException;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::DatatypeConfigurationException : public ::java::lang::Exception
-{
-
-public:
-  DatatypeConfigurationException();
-  DatatypeConfigurationException(::java::lang::String *);
-  DatatypeConfigurationException(::java::lang::String *, ::java::lang::Throwable *);
-  DatatypeConfigurationException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_DatatypeConfigurationException__
diff --git a/libjava/javax/xml/datatype/DatatypeConstants$Field.h b/libjava/javax/xml/datatype/DatatypeConstants$Field.h
deleted file mode 100644
index c30ee7a5149..00000000000
--- a/libjava/javax/xml/datatype/DatatypeConstants$Field.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_DatatypeConstants$Field__
-#define __javax_xml_datatype_DatatypeConstants$Field__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeConstants$Field;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::DatatypeConstants$Field : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DatatypeConstants$Field(jint, ::java::lang::String *);
-public:
-  jint getId();
-  ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_DatatypeConstants$Field__
diff --git a/libjava/javax/xml/datatype/DatatypeConstants.h b/libjava/javax/xml/datatype/DatatypeConstants.h
deleted file mode 100644
index 37c0c0445e8..00000000000
--- a/libjava/javax/xml/datatype/DatatypeConstants.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_DatatypeConstants__
-#define __javax_xml_datatype_DatatypeConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeConstants;
-          class DatatypeConstants$Field;
-      }
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::DatatypeConstants : public ::java::lang::Object
-{
-
-  DatatypeConstants();
-public:
-  static const jint JANUARY = 1;
-  static const jint FEBRUARY = 2;
-  static const jint MARCH = 3;
-  static const jint APRIL = 4;
-  static const jint MAY = 5;
-  static const jint JUNE = 6;
-  static const jint JULY = 7;
-  static const jint AUGUST = 8;
-  static const jint SEPTEMBER = 9;
-  static const jint OCTOBER = 10;
-  static const jint NOVEMBER = 11;
-  static const jint DECEMBER = 12;
-  static const jint LESSER = -1;
-  static const jint EQUAL = 0;
-  static const jint GREATER = 1;
-  static const jint INDETERMINATE = 2;
-  static const jint FIELD_UNDEFINED = -2147483647 - 1;
-  static ::javax::xml::datatype::DatatypeConstants$Field * YEARS;
-  static ::javax::xml::datatype::DatatypeConstants$Field * MONTHS;
-  static ::javax::xml::datatype::DatatypeConstants$Field * DAYS;
-  static ::javax::xml::datatype::DatatypeConstants$Field * HOURS;
-  static ::javax::xml::datatype::DatatypeConstants$Field * MINUTES;
-  static ::javax::xml::datatype::DatatypeConstants$Field * SECONDS;
-  static ::javax::xml::namespace$::QName * DATETIME;
-  static ::javax::xml::namespace$::QName * TIME;
-  static ::javax::xml::namespace$::QName * DATE;
-  static ::javax::xml::namespace$::QName * GYEARMONTH;
-  static ::javax::xml::namespace$::QName * GMONTHDAY;
-  static ::javax::xml::namespace$::QName * GYEAR;
-  static ::javax::xml::namespace$::QName * GMONTH;
-  static ::javax::xml::namespace$::QName * GDAY;
-  static ::javax::xml::namespace$::QName * DURATION;
-  static ::javax::xml::namespace$::QName * DURATION_DAYTIME;
-  static ::javax::xml::namespace$::QName * DURATION_YEARMONTH;
-  static const jint MAX_TIMEZONE_OFFSET = -840;
-  static const jint MIN_TIMEZONE_OFFSET = 840;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_DatatypeConstants__
diff --git a/libjava/javax/xml/datatype/DatatypeFactory.h b/libjava/javax/xml/datatype/DatatypeFactory.h
deleted file mode 100644
index dabb74fe420..00000000000
--- a/libjava/javax/xml/datatype/DatatypeFactory.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_DatatypeFactory__
-#define __javax_xml_datatype_DatatypeFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeFactory;
-          class Duration;
-          class XMLGregorianCalendar;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::DatatypeFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  DatatypeFactory();
-public:
-  static ::javax::xml::datatype::DatatypeFactory * newInstance();
-  virtual ::javax::xml::datatype::Duration * newDuration(::java::lang::String *) = 0;
-  virtual ::javax::xml::datatype::Duration * newDuration(jlong) = 0;
-  virtual ::javax::xml::datatype::Duration * newDuration(jboolean, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigDecimal *) = 0;
-  virtual ::javax::xml::datatype::Duration * newDuration(jboolean, jint, jint, jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::Duration * newDurationDayTime(::java::lang::String *);
-  virtual ::javax::xml::datatype::Duration * newDurationDayTime(jlong);
-  virtual ::javax::xml::datatype::Duration * newDurationDayTime(jboolean, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::javax::xml::datatype::Duration * newDurationDayTime(jboolean, jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::Duration * newDurationYearMonth(::java::lang::String *);
-  virtual ::javax::xml::datatype::Duration * newDurationYearMonth(jlong);
-  virtual ::javax::xml::datatype::Duration * newDurationYearMonth(jboolean, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::javax::xml::datatype::Duration * newDurationYearMonth(jboolean, jint, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar() = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar(::java::lang::String *) = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar(::java::util::GregorianCalendar *) = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar(::java::math::BigInteger *, jint, jint, jint, jint, jint, ::java::math::BigDecimal *, jint) = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar(jint, jint, jint, jint, jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendarDate(jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendarTime(jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendarTime(jint, jint, jint, ::java::math::BigDecimal *, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendarTime(jint, jint, jint, jint, jint);
-  static ::java::lang::String * DATATYPEFACTORY_PROPERTY;
-  static ::java::lang::String * DATATYPEFACTORY_IMPLEMENTATION_CLASS;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_DatatypeFactory__
diff --git a/libjava/javax/xml/datatype/Duration.h b/libjava/javax/xml/datatype/Duration.h
deleted file mode 100644
index 84f9782b254..00000000000
--- a/libjava/javax/xml/datatype/Duration.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_Duration__
-#define __javax_xml_datatype_Duration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeConstants$Field;
-          class Duration;
-      }
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::Duration : public ::java::lang::Object
-{
-
-public:
-  Duration();
-  virtual ::javax::xml::namespace$::QName * getXMLSchemaType();
-  virtual jint getSign() = 0;
-  virtual jint getYears();
-  virtual jint getMonths();
-  virtual jint getDays();
-  virtual jint getHours();
-  virtual jint getMinutes();
-  virtual jint getSeconds();
-  virtual jlong getTimeInMillis(::java::util::Calendar *);
-  virtual jlong getTimeInMillis(::java::util::Date *);
-  virtual ::java::lang::Number * getField(::javax::xml::datatype::DatatypeConstants$Field *) = 0;
-  virtual jboolean isSet(::javax::xml::datatype::DatatypeConstants$Field *) = 0;
-  virtual ::javax::xml::datatype::Duration * add(::javax::xml::datatype::Duration *) = 0;
-  virtual void addTo(::java::util::Calendar *) = 0;
-  virtual void addTo(::java::util::Date *);
-  virtual ::javax::xml::datatype::Duration * subtract(::javax::xml::datatype::Duration *);
-  virtual ::javax::xml::datatype::Duration * multiply(jint);
-  virtual ::javax::xml::datatype::Duration * multiply(::java::math::BigDecimal *) = 0;
-  virtual ::javax::xml::datatype::Duration * negate() = 0;
-  virtual ::javax::xml::datatype::Duration * normalizeWith(::java::util::Calendar *) = 0;
-  virtual jint compare(::javax::xml::datatype::Duration *) = 0;
-  virtual jboolean isLongerThan(::javax::xml::datatype::Duration *);
-  virtual jboolean isShorterThan(::javax::xml::datatype::Duration *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_Duration__
diff --git a/libjava/javax/xml/datatype/XMLGregorianCalendar.h b/libjava/javax/xml/datatype/XMLGregorianCalendar.h
deleted file mode 100644
index eda668f54e8..00000000000
--- a/libjava/javax/xml/datatype/XMLGregorianCalendar.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_XMLGregorianCalendar__
-#define __javax_xml_datatype_XMLGregorianCalendar__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class Duration;
-          class XMLGregorianCalendar;
-      }
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::XMLGregorianCalendar : public ::java::lang::Object
-{
-
-public:
-  XMLGregorianCalendar();
-  virtual void clear() = 0;
-  virtual void reset() = 0;
-  virtual void setYear(::java::math::BigInteger *) = 0;
-  virtual void setYear(jint) = 0;
-  virtual void setMonth(jint) = 0;
-  virtual void setDay(jint) = 0;
-  virtual void setTimezone(jint) = 0;
-  virtual void setTime(jint, jint, jint);
-  virtual void setHour(jint) = 0;
-  virtual void setMinute(jint) = 0;
-  virtual void setSecond(jint) = 0;
-  virtual void setMillisecond(jint) = 0;
-  virtual void setFractionalSecond(::java::math::BigDecimal *) = 0;
-  virtual void setTime(jint, jint, jint, ::java::math::BigDecimal *);
-  virtual void setTime(jint, jint, jint, jint);
-  virtual ::java::math::BigInteger * getEon() = 0;
-  virtual jint getYear() = 0;
-  virtual ::java::math::BigInteger * getEonAndYear() = 0;
-  virtual jint getMonth() = 0;
-  virtual jint getDay() = 0;
-  virtual jint getTimezone() = 0;
-  virtual jint getHour() = 0;
-  virtual jint getMinute() = 0;
-  virtual jint getSecond() = 0;
-  virtual jint getMillisecond();
-  virtual ::java::math::BigDecimal * getFractionalSecond() = 0;
-  virtual jint compare(::javax::xml::datatype::XMLGregorianCalendar *) = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * normalize() = 0;
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toXMLFormat() = 0;
-  virtual ::javax::xml::namespace$::QName * getXMLSchemaType() = 0;
-  virtual ::java::lang::String * toString();
-  virtual jboolean isValid() = 0;
-  virtual void add(::javax::xml::datatype::Duration *) = 0;
-  virtual ::java::util::GregorianCalendar * toGregorianCalendar() = 0;
-  virtual ::java::util::GregorianCalendar * toGregorianCalendar(::java::util::TimeZone *, ::java::util::Locale *, ::javax::xml::datatype::XMLGregorianCalendar *) = 0;
-  virtual ::java::util::TimeZone * getTimeZone(jint) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_XMLGregorianCalendar__
diff --git a/libjava/javax/xml/namespace/NamespaceContext.h b/libjava/javax/xml/namespace/NamespaceContext.h
deleted file mode 100644
index d0fd3410940..00000000000
--- a/libjava/javax/xml/namespace/NamespaceContext.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_namespace_NamespaceContext__
-#define __javax_xml_namespace_NamespaceContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-      }
-    }
-  }
-}
-
-class javax::xml::namespace$::NamespaceContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
-  virtual ::java::util::Iterator * getPrefixes(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_namespace_NamespaceContext__
diff --git a/libjava/javax/xml/namespace/QName.h b/libjava/javax/xml/namespace/QName.h
deleted file mode 100644
index a352b7cea8a..00000000000
--- a/libjava/javax/xml/namespace/QName.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_namespace_QName__
-#define __javax_xml_namespace_QName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class javax::xml::namespace$::QName : public ::java::lang::Object
-{
-
-public:
-  QName(::java::lang::String *, ::java::lang::String *);
-  QName(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  QName(::java::lang::String *);
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::java::lang::String * getLocalPart();
-  virtual ::java::lang::String * getPrefix();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::javax::xml::namespace$::QName * valueOf(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4418622981026545151LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceURI;
-  ::java::lang::String * localPart;
-  ::java::lang::String * prefix;
-  ::java::lang::String * qName;
-public: // actually package-private
-  jint hashCode__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_namespace_QName__
diff --git a/libjava/javax/xml/parsers/DocumentBuilder.h b/libjava/javax/xml/parsers/DocumentBuilder.h
deleted file mode 100644
index ea420ec9d5c..00000000000
--- a/libjava/javax/xml/parsers/DocumentBuilder.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_DocumentBuilder__
-#define __javax_xml_parsers_DocumentBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class DocumentBuilder;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class Document;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::DocumentBuilder : public ::java::lang::Object
-{
-
-public: // actually protected
-  DocumentBuilder();
-public:
-  virtual ::org::w3c::dom::Document * parse(::java::io::InputStream *);
-  virtual ::org::w3c::dom::Document * parse(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Document * parse(::java::lang::String *);
-  virtual ::org::w3c::dom::Document * parse(::java::io::File *);
-  virtual ::org::w3c::dom::Document * parse(::org::xml::sax::InputSource *) = 0;
-  virtual jboolean isNamespaceAware() = 0;
-  virtual jboolean isValidating() = 0;
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *) = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::w3c::dom::Document * newDocument() = 0;
-  virtual ::org::w3c::dom::DOMImplementation * getDOMImplementation() = 0;
-  virtual void reset();
-  virtual ::javax::xml::validation::Schema * getSchema();
-  virtual jboolean isXIncludeAware();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_DocumentBuilder__
diff --git a/libjava/javax/xml/parsers/DocumentBuilderFactory.h b/libjava/javax/xml/parsers/DocumentBuilderFactory.h
deleted file mode 100644
index 3e0e7d454d0..00000000000
--- a/libjava/javax/xml/parsers/DocumentBuilderFactory.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_DocumentBuilderFactory__
-#define __javax_xml_parsers_DocumentBuilderFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class DocumentBuilder;
-          class DocumentBuilderFactory;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::DocumentBuilderFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  DocumentBuilderFactory();
-public:
-  static ::javax::xml::parsers::DocumentBuilderFactory * newInstance();
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::parsers::DocumentBuilder * newDocumentBuilder() = 0;
-  virtual void setNamespaceAware(jboolean);
-  virtual void setValidating(jboolean);
-  virtual void setIgnoringElementContentWhitespace(jboolean);
-  virtual void setExpandEntityReferences(jboolean);
-  virtual void setIgnoringComments(jboolean);
-  virtual void setCoalescing(jboolean);
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-  virtual jboolean isIgnoringElementContentWhitespace();
-  virtual jboolean isExpandEntityReferences();
-  virtual jboolean isIgnoringComments();
-  virtual jboolean isCoalescing();
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *) = 0;
-  virtual ::javax::xml::validation::Schema * getSchema();
-  virtual void setSchema(::javax::xml::validation::Schema *);
-  virtual jboolean isXIncludeAware();
-  virtual void setXIncludeAware(jboolean);
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceAware;
-  jboolean validating;
-  jboolean ignoringElementContentWhitespace;
-  jboolean expandEntityReferences;
-  jboolean ignoringComments;
-  jboolean coalescing;
-  ::javax::xml::validation::Schema * schema;
-  jboolean xIncludeAware;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_DocumentBuilderFactory__
diff --git a/libjava/javax/xml/parsers/FactoryConfigurationError.h b/libjava/javax/xml/parsers/FactoryConfigurationError.h
deleted file mode 100644
index cf01101794b..00000000000
--- a/libjava/javax/xml/parsers/FactoryConfigurationError.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_FactoryConfigurationError__
-#define __javax_xml_parsers_FactoryConfigurationError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class FactoryConfigurationError;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::FactoryConfigurationError : public ::java::lang::Error
-{
-
-public:
-  FactoryConfigurationError();
-  FactoryConfigurationError(::java::lang::String *);
-  FactoryConfigurationError(::java::lang::Exception *);
-  FactoryConfigurationError(::java::lang::Exception *, ::java::lang::String *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Exception * getException();
-private:
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Error)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_FactoryConfigurationError__
diff --git a/libjava/javax/xml/parsers/ParserConfigurationException.h b/libjava/javax/xml/parsers/ParserConfigurationException.h
deleted file mode 100644
index 26bc1e8dee8..00000000000
--- a/libjava/javax/xml/parsers/ParserConfigurationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_ParserConfigurationException__
-#define __javax_xml_parsers_ParserConfigurationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class ParserConfigurationException;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::ParserConfigurationException : public ::java::lang::Exception
-{
-
-public:
-  ParserConfigurationException();
-  ParserConfigurationException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_ParserConfigurationException__
diff --git a/libjava/javax/xml/parsers/SAXParser.h b/libjava/javax/xml/parsers/SAXParser.h
deleted file mode 100644
index b24df528734..00000000000
--- a/libjava/javax/xml/parsers/SAXParser.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_SAXParser__
-#define __javax_xml_parsers_SAXParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class SAXParser;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class HandlerBase;
-          class InputSource;
-          class Parser;
-          class XMLReader;
-        namespace helpers
-        {
-            class DefaultHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::SAXParser : public ::java::lang::Object
-{
-
-public: // actually protected
-  SAXParser();
-public:
-  virtual void parse(::java::io::InputStream *, ::org::xml::sax::HandlerBase *);
-  virtual void parse(::java::io::InputStream *, ::org::xml::sax::HandlerBase *, ::java::lang::String *);
-  virtual void parse(::java::io::InputStream *, ::org::xml::sax::helpers::DefaultHandler *);
-  virtual void parse(::java::io::InputStream *, ::org::xml::sax::helpers::DefaultHandler *, ::java::lang::String *);
-  virtual void parse(::java::lang::String *, ::org::xml::sax::HandlerBase *);
-  virtual void parse(::java::lang::String *, ::org::xml::sax::helpers::DefaultHandler *);
-  virtual void parse(::java::io::File *, ::org::xml::sax::HandlerBase *);
-  virtual void parse(::java::io::File *, ::org::xml::sax::helpers::DefaultHandler *);
-  virtual void parse(::org::xml::sax::InputSource *, ::org::xml::sax::HandlerBase *);
-  virtual void parse(::org::xml::sax::InputSource *, ::org::xml::sax::helpers::DefaultHandler *);
-  virtual ::org::xml::sax::Parser * getParser() = 0;
-  virtual ::org::xml::sax::XMLReader * getXMLReader() = 0;
-  virtual jboolean isNamespaceAware() = 0;
-  virtual jboolean isValidating() = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual void reset();
-  virtual ::javax::xml::validation::Schema * getSchema();
-  virtual jboolean isXIncludeAware();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_SAXParser__
diff --git a/libjava/javax/xml/parsers/SAXParserFactory.h b/libjava/javax/xml/parsers/SAXParserFactory.h
deleted file mode 100644
index 42a8740b587..00000000000
--- a/libjava/javax/xml/parsers/SAXParserFactory.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_SAXParserFactory__
-#define __javax_xml_parsers_SAXParserFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class SAXParser;
-          class SAXParserFactory;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::SAXParserFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  SAXParserFactory();
-public:
-  static ::javax::xml::parsers::SAXParserFactory * newInstance();
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::parsers::SAXParser * newSAXParser() = 0;
-  virtual void setNamespaceAware(jboolean);
-  virtual void setValidating(jboolean);
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-  virtual ::javax::xml::validation::Schema * getSchema();
-  virtual void setSchema(::javax::xml::validation::Schema *);
-  virtual jboolean isXIncludeAware();
-  virtual void setXIncludeAware(jboolean);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) validating;
-  jboolean namespaceAware;
-  ::javax::xml::validation::Schema * schema;
-  jboolean xIncludeAware;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_SAXParserFactory__
diff --git a/libjava/javax/xml/stream/EventFilter.h b/libjava/javax/xml/stream/EventFilter.h
deleted file mode 100644
index 92cdd248063..00000000000
--- a/libjava/javax/xml/stream/EventFilter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_EventFilter__
-#define __javax_xml_stream_EventFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EventFilter;
-        namespace events
-        {
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::EventFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean accept(::javax::xml::stream::events::XMLEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_EventFilter__
diff --git a/libjava/javax/xml/stream/FactoryConfigurationError.h b/libjava/javax/xml/stream/FactoryConfigurationError.h
deleted file mode 100644
index 78ecdf6a06e..00000000000
--- a/libjava/javax/xml/stream/FactoryConfigurationError.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_FactoryConfigurationError__
-#define __javax_xml_stream_FactoryConfigurationError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class FactoryConfigurationError;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::FactoryConfigurationError : public ::java::lang::Error
-{
-
-public:
-  FactoryConfigurationError();
-  FactoryConfigurationError(::java::lang::Exception *);
-  FactoryConfigurationError(::java::lang::Exception *, ::java::lang::String *);
-  FactoryConfigurationError(::java::lang::String *, ::java::lang::Exception *);
-  FactoryConfigurationError(::java::lang::String *);
-  virtual ::java::lang::Exception * getException();
-  virtual ::java::lang::String * getMessage();
-private:
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Error)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_FactoryConfigurationError__
diff --git a/libjava/javax/xml/stream/Location.h b/libjava/javax/xml/stream/Location.h
deleted file mode 100644
index c997a80118d..00000000000
--- a/libjava/javax/xml/stream/Location.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_Location__
-#define __javax_xml_stream_Location__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::Location : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  virtual jint getCharacterOffset() = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_Location__
diff --git a/libjava/javax/xml/stream/StreamFilter.h b/libjava/javax/xml/stream/StreamFilter.h
deleted file mode 100644
index 82daf6ad5fc..00000000000
--- a/libjava/javax/xml/stream/StreamFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_StreamFilter__
-#define __javax_xml_stream_StreamFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class StreamFilter;
-          class XMLStreamReader;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::StreamFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean accept(::javax::xml::stream::XMLStreamReader *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_StreamFilter__
diff --git a/libjava/javax/xml/stream/XMLEventFactory.h b/libjava/javax/xml/stream/XMLEventFactory.h
deleted file mode 100644
index d64a2859be1..00000000000
--- a/libjava/javax/xml/stream/XMLEventFactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLEventFactory__
-#define __javax_xml_stream_XMLEventFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-          class XMLEventFactory;
-        namespace events
-        {
-            class Attribute;
-            class Characters;
-            class Comment;
-            class DTD;
-            class EndDocument;
-            class EndElement;
-            class EntityDeclaration;
-            class EntityReference;
-            class Namespace;
-            class ProcessingInstruction;
-            class StartDocument;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLEventFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLEventFactory();
-public:
-  static ::javax::xml::stream::XMLEventFactory * newInstance();
-  static ::javax::xml::stream::XMLEventFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual void setLocation(::javax::xml::stream::Location *) = 0;
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace$::QName *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace$::NamespaceContext *) = 0;
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *) = 0;
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *) = 0;
-  virtual ::javax::xml::stream::events::Characters * createCharacters(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Characters * createCData(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Characters * createSpace(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Characters * createIgnorableSpace(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument() = 0;
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::EndDocument * createEndDocument() = 0;
-  virtual ::javax::xml::stream::events::EntityReference * createEntityReference(::java::lang::String *, ::javax::xml::stream::events::EntityDeclaration *) = 0;
-  virtual ::javax::xml::stream::events::Comment * createComment(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::ProcessingInstruction * createProcessingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::DTD * createDTD(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_XMLEventFactory__
diff --git a/libjava/javax/xml/stream/XMLEventReader.h b/libjava/javax/xml/stream/XMLEventReader.h
deleted file mode 100644
index e4ef90a6a9b..00000000000
--- a/libjava/javax/xml/stream/XMLEventReader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLEventReader__
-#define __javax_xml_stream_XMLEventReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLEventReader : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::stream::events::XMLEvent * nextEvent() = 0;
-  virtual jboolean hasNext() = 0;
-  virtual ::javax::xml::stream::events::XMLEvent * peek() = 0;
-  virtual ::java::lang::String * getElementText() = 0;
-  virtual ::javax::xml::stream::events::XMLEvent * nextTag() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::Object * next() = 0;
-  virtual void remove() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLEventReader__
diff --git a/libjava/javax/xml/stream/XMLEventWriter.h b/libjava/javax/xml/stream/XMLEventWriter.h
deleted file mode 100644
index 9ed0aa1df47..00000000000
--- a/libjava/javax/xml/stream/XMLEventWriter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLEventWriter__
-#define __javax_xml_stream_XMLEventWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-      }
-      namespace stream
-      {
-          class XMLEventReader;
-          class XMLEventWriter;
-        namespace events
-        {
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLEventWriter : public ::java::lang::Object
-{
-
-public:
-  virtual void flush() = 0;
-  virtual void close() = 0;
-  virtual void add(::javax::xml::stream::events::XMLEvent *) = 0;
-  virtual void add(::javax::xml::stream::XMLEventReader *) = 0;
-  virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
-  virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setDefaultNamespace(::java::lang::String *) = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLEventWriter__
diff --git a/libjava/javax/xml/stream/XMLInputFactory.h b/libjava/javax/xml/stream/XMLInputFactory.h
deleted file mode 100644
index 13239f143cc..00000000000
--- a/libjava/javax/xml/stream/XMLInputFactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLInputFactory__
-#define __javax_xml_stream_XMLInputFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EventFilter;
-          class StreamFilter;
-          class XMLEventReader;
-          class XMLInputFactory;
-          class XMLReporter;
-          class XMLResolver;
-          class XMLStreamReader;
-        namespace util
-        {
-            class XMLEventAllocator;
-        }
-      }
-      namespace transform
-      {
-          class Source;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLInputFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLInputFactory();
-public:
-  static ::javax::xml::stream::XMLInputFactory * newInstance();
-  static ::javax::xml::stream::XMLInputFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::Reader *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::InputStream *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::InputStream *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::lang::String *, ::java::io::InputStream *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::lang::String *, ::java::io::Reader *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::Reader *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::lang::String *, ::java::io::Reader *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::javax::xml::stream::XMLStreamReader *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::InputStream *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::InputStream *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::lang::String *, ::java::io::InputStream *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createFilteredReader(::javax::xml::stream::XMLStreamReader *, ::javax::xml::stream::StreamFilter *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createFilteredReader(::javax::xml::stream::XMLEventReader *, ::javax::xml::stream::EventFilter *) = 0;
-  virtual ::javax::xml::stream::XMLResolver * getXMLResolver() = 0;
-  virtual void setXMLResolver(::javax::xml::stream::XMLResolver *) = 0;
-  virtual ::javax::xml::stream::XMLReporter * getXMLReporter() = 0;
-  virtual void setXMLReporter(::javax::xml::stream::XMLReporter *) = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual jboolean isPropertySupported(::java::lang::String *) = 0;
-  virtual void setEventAllocator(::javax::xml::stream::util::XMLEventAllocator *) = 0;
-  virtual ::javax::xml::stream::util::XMLEventAllocator * getEventAllocator() = 0;
-  static ::java::lang::String * IS_NAMESPACE_AWARE;
-  static ::java::lang::String * IS_VALIDATING;
-  static ::java::lang::String * IS_COALESCING;
-  static ::java::lang::String * IS_REPLACING_ENTITY_REFERENCES;
-  static ::java::lang::String * IS_SUPPORTING_EXTERNAL_ENTITIES;
-  static ::java::lang::String * SUPPORT_DTD;
-  static ::java::lang::String * REPORTER;
-  static ::java::lang::String * RESOLVER;
-  static ::java::lang::String * ALLOCATOR;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_XMLInputFactory__
diff --git a/libjava/javax/xml/stream/XMLOutputFactory.h b/libjava/javax/xml/stream/XMLOutputFactory.h
deleted file mode 100644
index ad20deb70d9..00000000000
--- a/libjava/javax/xml/stream/XMLOutputFactory.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLOutputFactory__
-#define __javax_xml_stream_XMLOutputFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventWriter;
-          class XMLOutputFactory;
-          class XMLStreamWriter;
-      }
-      namespace transform
-      {
-          class Result;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLOutputFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLOutputFactory();
-public:
-  static ::javax::xml::stream::XMLOutputFactory * newInstance();
-  static ::javax::xml::stream::XMLOutputFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::Writer *) = 0;
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *) = 0;
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::javax::xml::transform::Result *) = 0;
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::javax::xml::transform::Result *) = 0;
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::OutputStream *) = 0;
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::OutputStream *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::Writer *) = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual jboolean isPropertySupported(::java::lang::String *) = 0;
-  static ::java::lang::String * IS_REPAIRING_NAMESPACES;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_XMLOutputFactory__
diff --git a/libjava/javax/xml/stream/XMLReporter.h b/libjava/javax/xml/stream/XMLReporter.h
deleted file mode 100644
index 4416f840873..00000000000
--- a/libjava/javax/xml/stream/XMLReporter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLReporter__
-#define __javax_xml_stream_XMLReporter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-          class XMLReporter;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLReporter : public ::java::lang::Object
-{
-
-public:
-  virtual void report(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::xml::stream::Location *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLReporter__
diff --git a/libjava/javax/xml/stream/XMLResolver.h b/libjava/javax/xml/stream/XMLResolver.h
deleted file mode 100644
index 254dc2ca2a8..00000000000
--- a/libjava/javax/xml/stream/XMLResolver.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLResolver__
-#define __javax_xml_stream_XMLResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * resolveEntity(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLResolver__
diff --git a/libjava/javax/xml/stream/XMLStreamConstants.h b/libjava/javax/xml/stream/XMLStreamConstants.h
deleted file mode 100644
index d042a7cd0ee..00000000000
--- a/libjava/javax/xml/stream/XMLStreamConstants.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLStreamConstants__
-#define __javax_xml_stream_XMLStreamConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamConstants;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLStreamConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint START_ELEMENT = 1;
-  static const jint END_ELEMENT = 2;
-  static const jint PROCESSING_INSTRUCTION = 3;
-  static const jint CHARACTERS = 4;
-  static const jint COMMENT = 5;
-  static const jint SPACE = 6;
-  static const jint START_DOCUMENT = 7;
-  static const jint END_DOCUMENT = 8;
-  static const jint ENTITY_REFERENCE = 9;
-  static const jint ATTRIBUTE = 10;
-  static const jint DTD = 11;
-  static const jint CDATA = 12;
-  static const jint NAMESPACE = 13;
-  static const jint NOTATION_DECLARATION = 14;
-  static const jint ENTITY_DECLARATION = 15;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLStreamConstants__
diff --git a/libjava/javax/xml/stream/XMLStreamException.h b/libjava/javax/xml/stream/XMLStreamException.h
deleted file mode 100644
index 71acc39c0b4..00000000000
--- a/libjava/javax/xml/stream/XMLStreamException.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLStreamException__
-#define __javax_xml_stream_XMLStreamException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-          class XMLStreamException;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLStreamException : public ::java::lang::Exception
-{
-
-public:
-  XMLStreamException();
-  XMLStreamException(::java::lang::String *);
-  XMLStreamException(::java::lang::Throwable *);
-  XMLStreamException(::java::lang::String *, ::java::lang::Throwable *);
-  XMLStreamException(::java::lang::String *, ::javax::xml::stream::Location *, ::java::lang::Throwable *);
-  XMLStreamException(::java::lang::String *, ::javax::xml::stream::Location *);
-  virtual ::java::lang::Throwable * getNestedException();
-  virtual ::javax::xml::stream::Location * getLocation();
-public: // actually protected
-  ::javax::xml::stream::Location * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) location;
-  ::java::lang::Throwable * nested;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_XMLStreamException__
diff --git a/libjava/javax/xml/stream/XMLStreamReader.h b/libjava/javax/xml/stream/XMLStreamReader.h
deleted file mode 100644
index 47b49b40814..00000000000
--- a/libjava/javax/xml/stream/XMLStreamReader.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLStreamReader__
-#define __javax_xml_stream_XMLStreamReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-          class XMLStreamReader;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLStreamReader : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual jint next() = 0;
-  virtual void require(jint, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getElementText() = 0;
-  virtual jint nextTag() = 0;
-  virtual jboolean hasNext() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isWhiteSpace() = 0;
-  virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getAttributeCount() = 0;
-  virtual ::javax::xml::namespace$::QName * getAttributeName(jint) = 0;
-  virtual ::java::lang::String * getAttributeNamespace(jint) = 0;
-  virtual ::java::lang::String * getAttributeLocalName(jint) = 0;
-  virtual ::java::lang::String * getAttributePrefix(jint) = 0;
-  virtual ::java::lang::String * getAttributeType(jint) = 0;
-  virtual ::java::lang::String * getAttributeValue(jint) = 0;
-  virtual jboolean isAttributeSpecified(jint) = 0;
-  virtual jint getNamespaceCount() = 0;
-  virtual ::java::lang::String * getNamespacePrefix(jint) = 0;
-  virtual ::java::lang::String * getNamespaceURI(jint) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual JArray< jchar > * getTextCharacters() = 0;
-  virtual jint getTextCharacters(jint, JArray< jchar > *, jint, jint) = 0;
-  virtual jint getTextStart() = 0;
-  virtual jint getTextLength() = 0;
-  virtual ::java::lang::String * getEncoding() = 0;
-  virtual jboolean hasText() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasName() = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual ::java::lang::String * getVersion() = 0;
-  virtual jboolean isStandalone() = 0;
-  virtual jboolean standaloneSet() = 0;
-  virtual ::java::lang::String * getCharacterEncodingScheme() = 0;
-  virtual ::java::lang::String * getPITarget() = 0;
-  virtual ::java::lang::String * getPIData() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLStreamReader__
diff --git a/libjava/javax/xml/stream/XMLStreamWriter.h b/libjava/javax/xml/stream/XMLStreamWriter.h
deleted file mode 100644
index e4bed463c00..00000000000
--- a/libjava/javax/xml/stream/XMLStreamWriter.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLStreamWriter__
-#define __javax_xml_stream_XMLStreamWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-      }
-      namespace stream
-      {
-          class XMLStreamWriter;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLStreamWriter : public ::java::lang::Object
-{
-
-public:
-  virtual void writeStartElement(::java::lang::String *) = 0;
-  virtual void writeStartElement(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeEmptyElement(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeEmptyElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeEmptyElement(::java::lang::String *) = 0;
-  virtual void writeEndElement() = 0;
-  virtual void writeEndDocument() = 0;
-  virtual void close() = 0;
-  virtual void flush() = 0;
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeNamespace(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeDefaultNamespace(::java::lang::String *) = 0;
-  virtual void writeComment(::java::lang::String *) = 0;
-  virtual void writeProcessingInstruction(::java::lang::String *) = 0;
-  virtual void writeProcessingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeCData(::java::lang::String *) = 0;
-  virtual void writeDTD(::java::lang::String *) = 0;
-  virtual void writeEntityRef(::java::lang::String *) = 0;
-  virtual void writeStartDocument() = 0;
-  virtual void writeStartDocument(::java::lang::String *) = 0;
-  virtual void writeStartDocument(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeCharacters(::java::lang::String *) = 0;
-  virtual void writeCharacters(JArray< jchar > *, jint, jint) = 0;
-  virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
-  virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setDefaultNamespace(::java::lang::String *) = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLStreamWriter__
diff --git a/libjava/javax/xml/stream/events/Attribute.h b/libjava/javax/xml/stream/events/Attribute.h
deleted file mode 100644
index d4e42b5a5f2..00000000000
--- a/libjava/javax/xml/stream/events/Attribute.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_Attribute__
-#define __javax_xml_stream_events_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Attribute;
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::Attribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual ::java::lang::String * getDTDType() = 0;
-  virtual jboolean isSpecified() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_Attribute__
diff --git a/libjava/javax/xml/stream/events/Characters.h b/libjava/javax/xml/stream/events/Characters.h
deleted file mode 100644
index 539d45f3cd9..00000000000
--- a/libjava/javax/xml/stream/events/Characters.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_Characters__
-#define __javax_xml_stream_events_Characters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::Characters : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getData() = 0;
-  virtual jboolean isWhiteSpace() = 0;
-  virtual jboolean isCData() = 0;
-  virtual jboolean isIgnorableWhiteSpace() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_Characters__
diff --git a/libjava/javax/xml/stream/events/Comment.h b/libjava/javax/xml/stream/events/Comment.h
deleted file mode 100644
index ba81b85a845..00000000000
--- a/libjava/javax/xml/stream/events/Comment.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_Comment__
-#define __javax_xml_stream_events_Comment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class Comment;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::Comment : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getText() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_Comment__
diff --git a/libjava/javax/xml/stream/events/DTD.h b/libjava/javax/xml/stream/events/DTD.h
deleted file mode 100644
index 2932d6871f4..00000000000
--- a/libjava/javax/xml/stream/events/DTD.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_DTD__
-#define __javax_xml_stream_events_DTD__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class DTD;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::DTD : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getDocumentTypeDeclaration() = 0;
-  virtual ::java::lang::Object * getProcessedDTD() = 0;
-  virtual ::java::util::List * getNotations() = 0;
-  virtual ::java::util::List * getEntities() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_DTD__
diff --git a/libjava/javax/xml/stream/events/EndDocument.h b/libjava/javax/xml/stream/events/EndDocument.h
deleted file mode 100644
index e3cdc98db26..00000000000
--- a/libjava/javax/xml/stream/events/EndDocument.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_EndDocument__
-#define __javax_xml_stream_events_EndDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndDocument;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::EndDocument : public ::java::lang::Object
-{
-
-public:
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_EndDocument__
diff --git a/libjava/javax/xml/stream/events/EndElement.h b/libjava/javax/xml/stream/events/EndElement.h
deleted file mode 100644
index b67f2bb183d..00000000000
--- a/libjava/javax/xml/stream/events/EndElement.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_EndElement__
-#define __javax_xml_stream_events_EndElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::EndElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
-  virtual ::java::util::Iterator * getNamespaces() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_EndElement__
diff --git a/libjava/javax/xml/stream/events/EntityDeclaration.h b/libjava/javax/xml/stream/events/EntityDeclaration.h
deleted file mode 100644
index f4075edc44a..00000000000
--- a/libjava/javax/xml/stream/events/EntityDeclaration.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_EntityDeclaration__
-#define __javax_xml_stream_events_EntityDeclaration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class EntityDeclaration;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::EntityDeclaration : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::String * getNotationName() = 0;
-  virtual ::java::lang::String * getReplacementText() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_EntityDeclaration__
diff --git a/libjava/javax/xml/stream/events/EntityReference.h b/libjava/javax/xml/stream/events/EntityReference.h
deleted file mode 100644
index 548bbc6b335..00000000000
--- a/libjava/javax/xml/stream/events/EntityReference.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_EntityReference__
-#define __javax_xml_stream_events_EntityReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class EntityDeclaration;
-            class EntityReference;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::EntityReference : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::stream::events::EntityDeclaration * getDeclaration() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_EntityReference__
diff --git a/libjava/javax/xml/stream/events/Namespace.h b/libjava/javax/xml/stream/events/Namespace.h
deleted file mode 100644
index 7c05ab8cf44..00000000000
--- a/libjava/javax/xml/stream/events/Namespace.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_Namespace__
-#define __javax_xml_stream_events_Namespace__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class Namespace;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::Namespace : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual jboolean isDefaultNamespaceDeclaration() = 0;
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual ::java::lang::String * getDTDType() = 0;
-  virtual jboolean isSpecified() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_Namespace__
diff --git a/libjava/javax/xml/stream/events/NotationDeclaration.h b/libjava/javax/xml/stream/events/NotationDeclaration.h
deleted file mode 100644
index c60a79ebc52..00000000000
--- a/libjava/javax/xml/stream/events/NotationDeclaration.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_NotationDeclaration__
-#define __javax_xml_stream_events_NotationDeclaration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class NotationDeclaration;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::NotationDeclaration : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_NotationDeclaration__
diff --git a/libjava/javax/xml/stream/events/ProcessingInstruction.h b/libjava/javax/xml/stream/events/ProcessingInstruction.h
deleted file mode 100644
index 79f969d6985..00000000000
--- a/libjava/javax/xml/stream/events/ProcessingInstruction.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_ProcessingInstruction__
-#define __javax_xml_stream_events_ProcessingInstruction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class ProcessingInstruction;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::ProcessingInstruction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getTarget() = 0;
-  virtual ::java::lang::String * getData() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_ProcessingInstruction__
diff --git a/libjava/javax/xml/stream/events/StartDocument.h b/libjava/javax/xml/stream/events/StartDocument.h
deleted file mode 100644
index 112e600316e..00000000000
--- a/libjava/javax/xml/stream/events/StartDocument.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_StartDocument__
-#define __javax_xml_stream_events_StartDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartDocument;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::StartDocument : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::java::lang::String * getCharacterEncodingScheme() = 0;
-  virtual jboolean encodingSet() = 0;
-  virtual jboolean isStandalone() = 0;
-  virtual jboolean standaloneSet() = 0;
-  virtual ::java::lang::String * getVersion() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_StartDocument__
diff --git a/libjava/javax/xml/stream/events/StartElement.h b/libjava/javax/xml/stream/events/StartElement.h
deleted file mode 100644
index 2dd50e6c87c..00000000000
--- a/libjava/javax/xml/stream/events/StartElement.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_StartElement__
-#define __javax_xml_stream_events_StartElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Attribute;
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::StartElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::namespace$::QName * getName() = 0;
-  virtual ::java::util::Iterator * getAttributes() = 0;
-  virtual ::java::util::Iterator * getNamespaces() = 0;
-  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace$::QName *) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_StartElement__
diff --git a/libjava/javax/xml/stream/events/XMLEvent.h b/libjava/javax/xml/stream/events/XMLEvent.h
deleted file mode 100644
index 837f2a89474..00000000000
--- a/libjava/javax/xml/stream/events/XMLEvent.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_XMLEvent__
-#define __javax_xml_stream_events_XMLEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartElement;
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::XMLEvent : public ::java::lang::Object
-{
-
-public:
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_XMLEvent__
diff --git a/libjava/javax/xml/stream/util/EventReaderDelegate.h b/libjava/javax/xml/stream/util/EventReaderDelegate.h
deleted file mode 100644
index fc1bb75bbfa..00000000000
--- a/libjava/javax/xml/stream/util/EventReaderDelegate.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_util_EventReaderDelegate__
-#define __javax_xml_stream_util_EventReaderDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-        namespace util
-        {
-            class EventReaderDelegate;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::util::EventReaderDelegate : public ::java::lang::Object
-{
-
-public:
-  EventReaderDelegate();
-  EventReaderDelegate(::javax::xml::stream::XMLEventReader *);
-  virtual void setParent(::javax::xml::stream::XMLEventReader *);
-  virtual ::javax::xml::stream::XMLEventReader * getParent();
-  virtual ::javax::xml::stream::events::XMLEvent * nextEvent();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasNext();
-  virtual ::javax::xml::stream::events::XMLEvent * peek();
-  virtual ::java::lang::String * getElementText();
-  virtual ::javax::xml::stream::events::XMLEvent * nextTag();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void close();
-  virtual void remove();
-private:
-  ::javax::xml::stream::XMLEventReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_util_EventReaderDelegate__
diff --git a/libjava/javax/xml/stream/util/StreamReaderDelegate.h b/libjava/javax/xml/stream/util/StreamReaderDelegate.h
deleted file mode 100644
index 86864cb5718..00000000000
--- a/libjava/javax/xml/stream/util/StreamReaderDelegate.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_util_StreamReaderDelegate__
-#define __javax_xml_stream_util_StreamReaderDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-          class XMLStreamReader;
-        namespace util
-        {
-            class StreamReaderDelegate;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::util::StreamReaderDelegate : public ::java::lang::Object
-{
-
-public:
-  StreamReaderDelegate();
-  StreamReaderDelegate(::javax::xml::stream::XMLStreamReader *);
-  virtual void setParent(::javax::xml::stream::XMLStreamReader *);
-  virtual ::javax::xml::stream::XMLStreamReader * getParent();
-  virtual jint next();
-  virtual jint nextTag();
-  virtual ::java::lang::String * getElementText();
-  virtual void require(jint, ::java::lang::String *, ::java::lang::String *);
-  virtual jboolean hasNext();
-  virtual void close();
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
-  virtual jboolean isStartElement();
-  virtual jboolean isEndElement();
-  virtual jboolean isCharacters();
-  virtual jboolean isWhiteSpace();
-  virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *);
-  virtual jint getAttributeCount();
-  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
-  virtual ::java::lang::String * getAttributePrefix(jint);
-  virtual ::java::lang::String * getAttributeNamespace(jint);
-  virtual ::java::lang::String * getAttributeLocalName(jint);
-  virtual ::java::lang::String * getAttributeType(jint);
-  virtual ::java::lang::String * getAttributeValue(jint);
-  virtual jboolean isAttributeSpecified(jint);
-  virtual jint getNamespaceCount();
-  virtual ::java::lang::String * getNamespacePrefix(jint);
-  virtual ::java::lang::String * getNamespaceURI(jint);
-  virtual jint getEventType();
-  virtual ::java::lang::String * getText();
-  virtual jint getTextCharacters(jint, JArray< jchar > *, jint, jint);
-  virtual JArray< jchar > * getTextCharacters();
-  virtual jint getTextStart();
-  virtual jint getTextLength();
-  virtual ::java::lang::String * getEncoding();
-  virtual jboolean hasText();
-  virtual ::javax::xml::stream::Location * getLocation();
-  virtual ::javax::xml::namespace$::QName * getName();
-  virtual ::java::lang::String * getLocalName();
-  virtual jboolean hasName();
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::java::lang::String * getPrefix();
-  virtual ::java::lang::String * getVersion();
-  virtual jboolean isStandalone();
-  virtual jboolean standaloneSet();
-  virtual ::java::lang::String * getCharacterEncodingScheme();
-  virtual ::java::lang::String * getPITarget();
-  virtual ::java::lang::String * getPIData();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-private:
-  ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_util_StreamReaderDelegate__
diff --git a/libjava/javax/xml/stream/util/XMLEventAllocator.h b/libjava/javax/xml/stream/util/XMLEventAllocator.h
deleted file mode 100644
index ac872525c28..00000000000
--- a/libjava/javax/xml/stream/util/XMLEventAllocator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_util_XMLEventAllocator__
-#define __javax_xml_stream_util_XMLEventAllocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-        namespace util
-        {
-            class XMLEventAllocator;
-            class XMLEventConsumer;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::util::XMLEventAllocator : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::stream::util::XMLEventAllocator * newInstance() = 0;
-  virtual ::javax::xml::stream::events::XMLEvent * allocate(::javax::xml::stream::XMLStreamReader *) = 0;
-  virtual void allocate(::javax::xml::stream::XMLStreamReader *, ::javax::xml::stream::util::XMLEventConsumer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_util_XMLEventAllocator__
diff --git a/libjava/javax/xml/stream/util/XMLEventConsumer.h b/libjava/javax/xml/stream/util/XMLEventConsumer.h
deleted file mode 100644
index 7fb1fcf31e4..00000000000
--- a/libjava/javax/xml/stream/util/XMLEventConsumer.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_util_XMLEventConsumer__
-#define __javax_xml_stream_util_XMLEventConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-        namespace events
-        {
-            class XMLEvent;
-        }
-        namespace util
-        {
-            class XMLEventConsumer;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::util::XMLEventConsumer : public ::java::lang::Object
-{
-
-public:
-  virtual void add(::javax::xml::stream::events::XMLEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_util_XMLEventConsumer__
diff --git a/libjava/javax/xml/transform/ErrorListener.h b/libjava/javax/xml/transform/ErrorListener.h
deleted file mode 100644
index ec91067cca6..00000000000
--- a/libjava/javax/xml/transform/ErrorListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_ErrorListener__
-#define __javax_xml_transform_ErrorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class TransformerException;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::ErrorListener : public ::java::lang::Object
-{
-
-public:
-  virtual void warning(::javax::xml::transform::TransformerException *) = 0;
-  virtual void error(::javax::xml::transform::TransformerException *) = 0;
-  virtual void fatalError(::javax::xml::transform::TransformerException *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_ErrorListener__
diff --git a/libjava/javax/xml/transform/OutputKeys.h b/libjava/javax/xml/transform/OutputKeys.h
deleted file mode 100644
index d53a11f30cb..00000000000
--- a/libjava/javax/xml/transform/OutputKeys.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_OutputKeys__
-#define __javax_xml_transform_OutputKeys__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class OutputKeys;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::OutputKeys : public ::java::lang::Object
-{
-
-  OutputKeys();
-public:
-  static ::java::lang::String * METHOD;
-  static ::java::lang::String * VERSION;
-  static ::java::lang::String * ENCODING;
-  static ::java::lang::String * OMIT_XML_DECLARATION;
-  static ::java::lang::String * STANDALONE;
-  static ::java::lang::String * DOCTYPE_PUBLIC;
-  static ::java::lang::String * DOCTYPE_SYSTEM;
-  static ::java::lang::String * CDATA_SECTION_ELEMENTS;
-  static ::java::lang::String * INDENT;
-  static ::java::lang::String * MEDIA_TYPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_OutputKeys__
diff --git a/libjava/javax/xml/transform/Result.h b/libjava/javax/xml/transform/Result.h
deleted file mode 100644
index eb4fe02bd9e..00000000000
--- a/libjava/javax/xml/transform/Result.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_Result__
-#define __javax_xml_transform_Result__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::Result : public ::java::lang::Object
-{
-
-public:
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  static ::java::lang::String * PI_DISABLE_OUTPUT_ESCAPING;
-  static ::java::lang::String * PI_ENABLE_OUTPUT_ESCAPING;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_Result__
diff --git a/libjava/javax/xml/transform/Source.h b/libjava/javax/xml/transform/Source.h
deleted file mode 100644
index 72e2c4f45a6..00000000000
--- a/libjava/javax/xml/transform/Source.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_Source__
-#define __javax_xml_transform_Source__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::Source : public ::java::lang::Object
-{
-
-public:
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_Source__
diff --git a/libjava/javax/xml/transform/SourceLocator.h b/libjava/javax/xml/transform/SourceLocator.h
deleted file mode 100644
index 3084b8ad345..00000000000
--- a/libjava/javax/xml/transform/SourceLocator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_SourceLocator__
-#define __javax_xml_transform_SourceLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SourceLocator;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::SourceLocator : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_SourceLocator__
diff --git a/libjava/javax/xml/transform/Templates.h b/libjava/javax/xml/transform/Templates.h
deleted file mode 100644
index 33bb8b55810..00000000000
--- a/libjava/javax/xml/transform/Templates.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_Templates__
-#define __javax_xml_transform_Templates__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Templates;
-          class Transformer;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::Templates : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::transform::Transformer * newTransformer() = 0;
-  virtual ::java::util::Properties * getOutputProperties() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_Templates__
diff --git a/libjava/javax/xml/transform/Transformer.h b/libjava/javax/xml/transform/Transformer.h
deleted file mode 100644
index cd489803fe2..00000000000
--- a/libjava/javax/xml/transform/Transformer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_Transformer__
-#define __javax_xml_transform_Transformer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Result;
-          class Source;
-          class Transformer;
-          class URIResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::Transformer : public ::java::lang::Object
-{
-
-public: // actually protected
-  Transformer();
-public:
-  virtual void transform(::javax::xml::transform::Source *, ::javax::xml::transform::Result *) = 0;
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getParameter(::java::lang::String *) = 0;
-  virtual void clearParameters() = 0;
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *) = 0;
-  virtual ::javax::xml::transform::URIResolver * getURIResolver() = 0;
-  virtual void setOutputProperties(::java::util::Properties *) = 0;
-  virtual ::java::util::Properties * getOutputProperties() = 0;
-  virtual void setOutputProperty(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getOutputProperty(::java::lang::String *) = 0;
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *) = 0;
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener() = 0;
-  virtual void reset();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_Transformer__
diff --git a/libjava/javax/xml/transform/TransformerConfigurationException.h b/libjava/javax/xml/transform/TransformerConfigurationException.h
deleted file mode 100644
index d2a7d27ac22..00000000000
--- a/libjava/javax/xml/transform/TransformerConfigurationException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_TransformerConfigurationException__
-#define __javax_xml_transform_TransformerConfigurationException__
-
-#pragma interface
-
-#include <javax/xml/transform/TransformerException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SourceLocator;
-          class TransformerConfigurationException;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::TransformerConfigurationException : public ::javax::xml::transform::TransformerException
-{
-
-public:
-  TransformerConfigurationException();
-  TransformerConfigurationException(::java::lang::String *);
-  TransformerConfigurationException(::java::lang::Throwable *);
-  TransformerConfigurationException(::java::lang::String *, ::java::lang::Throwable *);
-  TransformerConfigurationException(::java::lang::String *, ::javax::xml::transform::SourceLocator *);
-  TransformerConfigurationException(::java::lang::String *, ::javax::xml::transform::SourceLocator *, ::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 1285547467942875745LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_TransformerConfigurationException__
diff --git a/libjava/javax/xml/transform/TransformerException.h b/libjava/javax/xml/transform/TransformerException.h
deleted file mode 100644
index 92158ce0338..00000000000
--- a/libjava/javax/xml/transform/TransformerException.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_TransformerException__
-#define __javax_xml_transform_TransformerException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SourceLocator;
-          class TransformerException;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::TransformerException : public ::java::lang::Exception
-{
-
-public:
-  TransformerException(::java::lang::String *);
-  TransformerException(::java::lang::Throwable *);
-  TransformerException(::java::lang::String *, ::java::lang::Throwable *);
-  TransformerException(::java::lang::String *, ::javax::xml::transform::SourceLocator *);
-  TransformerException(::java::lang::String *, ::javax::xml::transform::SourceLocator *, ::java::lang::Throwable *);
-  virtual ::javax::xml::transform::SourceLocator * getLocator();
-  virtual void setLocator(::javax::xml::transform::SourceLocator *);
-  virtual ::java::lang::Throwable * getException();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Throwable * initCause(::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessageAndLocation();
-  virtual ::java::lang::String * getLocationAsString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = 975798773772956428LL;
-  ::javax::xml::transform::SourceLocator * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) locator;
-  ::java::lang::Throwable * containedException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_TransformerException__
diff --git a/libjava/javax/xml/transform/TransformerFactory.h b/libjava/javax/xml/transform/TransformerFactory.h
deleted file mode 100644
index f16f1e784c4..00000000000
--- a/libjava/javax/xml/transform/TransformerFactory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_TransformerFactory__
-#define __javax_xml_transform_TransformerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Source;
-          class Templates;
-          class Transformer;
-          class TransformerFactory;
-          class URIResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::TransformerFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  TransformerFactory();
-public:
-  static ::javax::xml::transform::TransformerFactory * newInstance();
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::transform::Transformer * newTransformer(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::transform::Transformer * newTransformer() = 0;
-  virtual ::javax::xml::transform::Templates * newTemplates(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::transform::Source * getAssociatedStylesheet(::javax::xml::transform::Source *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *) = 0;
-  virtual ::javax::xml::transform::URIResolver * getURIResolver() = 0;
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *) = 0;
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *) = 0;
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_TransformerFactory__
diff --git a/libjava/javax/xml/transform/TransformerFactoryConfigurationError.h b/libjava/javax/xml/transform/TransformerFactoryConfigurationError.h
deleted file mode 100644
index d6edcff775f..00000000000
--- a/libjava/javax/xml/transform/TransformerFactoryConfigurationError.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_TransformerFactoryConfigurationError__
-#define __javax_xml_transform_TransformerFactoryConfigurationError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class TransformerFactoryConfigurationError;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::TransformerFactoryConfigurationError : public ::java::lang::Error
-{
-
-public:
-  TransformerFactoryConfigurationError();
-  TransformerFactoryConfigurationError(::java::lang::String *);
-  TransformerFactoryConfigurationError(::java::lang::Exception *);
-  TransformerFactoryConfigurationError(::java::lang::Exception *, ::java::lang::String *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Exception * getException();
-private:
-  static const jlong serialVersionUID = -6527718720676281516LL;
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Error)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_TransformerFactoryConfigurationError__
diff --git a/libjava/javax/xml/transform/URIResolver.h b/libjava/javax/xml/transform/URIResolver.h
deleted file mode 100644
index 5f64c81f891..00000000000
--- a/libjava/javax/xml/transform/URIResolver.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_URIResolver__
-#define __javax_xml_transform_URIResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-          class URIResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::URIResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::transform::Source * resolve(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_URIResolver__
diff --git a/libjava/javax/xml/transform/dom/DOMLocator.h b/libjava/javax/xml/transform/dom/DOMLocator.h
deleted file mode 100644
index 7bb475203bf..00000000000
--- a/libjava/javax/xml/transform/dom/DOMLocator.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_dom_DOMLocator__
-#define __javax_xml_transform_dom_DOMLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace dom
-        {
-            class DOMLocator;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::dom::DOMLocator : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Node * getOriginatingNode() = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_dom_DOMLocator__
diff --git a/libjava/javax/xml/transform/dom/DOMResult.h b/libjava/javax/xml/transform/dom/DOMResult.h
deleted file mode 100644
index 84e91a5cd03..00000000000
--- a/libjava/javax/xml/transform/dom/DOMResult.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_dom_DOMResult__
-#define __javax_xml_transform_dom_DOMResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace dom
-        {
-            class DOMResult;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::dom::DOMResult : public ::java::lang::Object
-{
-
-public:
-  DOMResult();
-  DOMResult(::org::w3c::dom::Node *);
-  DOMResult(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  DOMResult(::org::w3c::dom::Node *, ::java::lang::String *);
-  DOMResult(::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
-  virtual void setNode(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * getNode();
-  virtual void setNextSibling(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * getNextSibling();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  static ::java::lang::String * FEATURE;
-private:
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-  ::org::w3c::dom::Node * nextSibling;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_dom_DOMResult__
diff --git a/libjava/javax/xml/transform/dom/DOMSource.h b/libjava/javax/xml/transform/dom/DOMSource.h
deleted file mode 100644
index 3c8d935705b..00000000000
--- a/libjava/javax/xml/transform/dom/DOMSource.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_dom_DOMSource__
-#define __javax_xml_transform_dom_DOMSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace dom
-        {
-            class DOMSource;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::dom::DOMSource : public ::java::lang::Object
-{
-
-public:
-  DOMSource();
-  DOMSource(::org::w3c::dom::Node *);
-  DOMSource(::org::w3c::dom::Node *, ::java::lang::String *);
-  virtual void setNode(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * getNode();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  static ::java::lang::String * FEATURE;
-private:
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_dom_DOMSource__
diff --git a/libjava/javax/xml/transform/sax/SAXResult.h b/libjava/javax/xml/transform/sax/SAXResult.h
deleted file mode 100644
index b3e04b65dae..00000000000
--- a/libjava/javax/xml/transform/sax/SAXResult.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_SAXResult__
-#define __javax_xml_transform_sax_SAXResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace sax
-        {
-            class SAXResult;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-        namespace ext
-        {
-            class LexicalHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::SAXResult : public ::java::lang::Object
-{
-
-public:
-  SAXResult();
-  SAXResult(::org::xml::sax::ContentHandler *);
-  virtual void setHandler(::org::xml::sax::ContentHandler *);
-  virtual ::org::xml::sax::ContentHandler * getHandler();
-  virtual void setLexicalHandler(::org::xml::sax::ext::LexicalHandler *);
-  virtual ::org::xml::sax::ext::LexicalHandler * getLexicalHandler();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  static ::java::lang::String * FEATURE;
-private:
-  ::org::xml::sax::ContentHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) handler;
-  ::org::xml::sax::ext::LexicalHandler * lexicalHandler;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_sax_SAXResult__
diff --git a/libjava/javax/xml/transform/sax/SAXSource.h b/libjava/javax/xml/transform/sax/SAXSource.h
deleted file mode 100644
index 8c06ad8ec32..00000000000
--- a/libjava/javax/xml/transform/sax/SAXSource.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_SAXSource__
-#define __javax_xml_transform_sax_SAXSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-        namespace sax
-        {
-            class SAXSource;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::SAXSource : public ::java::lang::Object
-{
-
-public:
-  SAXSource();
-  SAXSource(::org::xml::sax::XMLReader *, ::org::xml::sax::InputSource *);
-  SAXSource(::org::xml::sax::InputSource *);
-  virtual void setXMLReader(::org::xml::sax::XMLReader *);
-  virtual ::org::xml::sax::XMLReader * getXMLReader();
-  virtual void setInputSource(::org::xml::sax::InputSource *);
-  virtual ::org::xml::sax::InputSource * getInputSource();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  static ::org::xml::sax::InputSource * sourceToInputSource(::javax::xml::transform::Source *);
-  static ::java::lang::String * FEATURE;
-private:
-  ::org::xml::sax::XMLReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xmlReader;
-  ::org::xml::sax::InputSource * inputSource;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_sax_SAXSource__
diff --git a/libjava/javax/xml/transform/sax/SAXTransformerFactory.h b/libjava/javax/xml/transform/sax/SAXTransformerFactory.h
deleted file mode 100644
index 7d26f5533a1..00000000000
--- a/libjava/javax/xml/transform/sax/SAXTransformerFactory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_SAXTransformerFactory__
-#define __javax_xml_transform_sax_SAXTransformerFactory__
-
-#pragma interface
-
-#include <javax/xml/transform/TransformerFactory.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-          class Templates;
-        namespace sax
-        {
-            class SAXTransformerFactory;
-            class TemplatesHandler;
-            class TransformerHandler;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class XMLFilter;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::SAXTransformerFactory : public ::javax::xml::transform::TransformerFactory
-{
-
-public: // actually protected
-  SAXTransformerFactory();
-public:
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler(::javax::xml::transform::Templates *) = 0;
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler() = 0;
-  virtual ::javax::xml::transform::sax::TemplatesHandler * newTemplatesHandler() = 0;
-  virtual ::org::xml::sax::XMLFilter * newXMLFilter(::javax::xml::transform::Source *) = 0;
-  virtual ::org::xml::sax::XMLFilter * newXMLFilter(::javax::xml::transform::Templates *) = 0;
-  static ::java::lang::String * FEATURE;
-  static ::java::lang::String * FEATURE_XMLFILTER;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_sax_SAXTransformerFactory__
diff --git a/libjava/javax/xml/transform/sax/TemplatesHandler.h b/libjava/javax/xml/transform/sax/TemplatesHandler.h
deleted file mode 100644
index 63f6834c18d..00000000000
--- a/libjava/javax/xml/transform/sax/TemplatesHandler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_TemplatesHandler__
-#define __javax_xml_transform_sax_TemplatesHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Templates;
-        namespace sax
-        {
-            class TemplatesHandler;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class Locator;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::TemplatesHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::transform::Templates * getTemplates() = 0;
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual void setDocumentLocator(::org::xml::sax::Locator *) = 0;
-  virtual void startDocument() = 0;
-  virtual void endDocument() = 0;
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endPrefixMapping(::java::lang::String *) = 0;
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *) = 0;
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint) = 0;
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void skippedEntity(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_sax_TemplatesHandler__
diff --git a/libjava/javax/xml/transform/sax/TransformerHandler.h b/libjava/javax/xml/transform/sax/TransformerHandler.h
deleted file mode 100644
index f6cbdc3094f..00000000000
--- a/libjava/javax/xml/transform/sax/TransformerHandler.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_TransformerHandler__
-#define __javax_xml_transform_sax_TransformerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Transformer;
-        namespace sax
-        {
-            class TransformerHandler;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class Locator;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::TransformerHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void setResult(::javax::xml::transform::Result *) = 0;
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::javax::xml::transform::Transformer * getTransformer() = 0;
-  virtual void setDocumentLocator(::org::xml::sax::Locator *) = 0;
-  virtual void startDocument() = 0;
-  virtual void endDocument() = 0;
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endPrefixMapping(::java::lang::String *) = 0;
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *) = 0;
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint) = 0;
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void skippedEntity(::java::lang::String *) = 0;
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endDTD() = 0;
-  virtual void startEntity(::java::lang::String *) = 0;
-  virtual void endEntity(::java::lang::String *) = 0;
-  virtual void startCDATA() = 0;
-  virtual void endCDATA() = 0;
-  virtual void comment(JArray< jchar > *, jint, jint) = 0;
-  virtual void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_sax_TransformerHandler__
diff --git a/libjava/javax/xml/transform/stream/StreamResult.h b/libjava/javax/xml/transform/stream/StreamResult.h
deleted file mode 100644
index dd9d09648f0..00000000000
--- a/libjava/javax/xml/transform/stream/StreamResult.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_stream_StreamResult__
-#define __javax_xml_transform_stream_StreamResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace stream
-        {
-            class StreamResult;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::transform::stream::StreamResult : public ::java::lang::Object
-{
-
-public:
-  StreamResult();
-  StreamResult(::java::io::OutputStream *);
-  StreamResult(::java::io::Writer *);
-  StreamResult(::java::lang::String *);
-  StreamResult(::java::io::File *);
-  virtual void setOutputStream(::java::io::OutputStream *);
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual void setWriter(::java::io::Writer *);
-  virtual ::java::io::Writer * getWriter();
-  virtual void setSystemId(::java::lang::String *);
-  virtual void setSystemId(::java::io::File *);
-  virtual ::java::lang::String * getSystemId();
-  static ::java::lang::String * FEATURE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) systemId;
-  ::java::io::OutputStream * outputStream;
-  ::java::io::Writer * writer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_stream_StreamResult__
diff --git a/libjava/javax/xml/transform/stream/StreamSource.h b/libjava/javax/xml/transform/stream/StreamSource.h
deleted file mode 100644
index 685a94a06b0..00000000000
--- a/libjava/javax/xml/transform/stream/StreamSource.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_stream_StreamSource__
-#define __javax_xml_transform_stream_StreamSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace stream
-        {
-            class StreamSource;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::transform::stream::StreamSource : public ::java::lang::Object
-{
-
-public:
-  StreamSource();
-  StreamSource(::java::io::InputStream *);
-  StreamSource(::java::io::InputStream *, ::java::lang::String *);
-  StreamSource(::java::io::Reader *);
-  StreamSource(::java::io::Reader *, ::java::lang::String *);
-  StreamSource(::java::lang::String *);
-  StreamSource(::java::io::File *);
-  virtual void setInputStream(::java::io::InputStream *);
-  virtual ::java::io::InputStream * getInputStream();
-  virtual void setReader(::java::io::Reader *);
-  virtual ::java::io::Reader * getReader();
-  virtual void setPublicId(::java::lang::String *);
-  virtual ::java::lang::String * getPublicId();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  virtual void setSystemId(::java::io::File *);
-  static ::java::lang::String * FEATURE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) publicId;
-  ::java::lang::String * systemId;
-  ::java::io::InputStream * inputStream;
-  ::java::io::Reader * reader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_stream_StreamSource__
diff --git a/libjava/javax/xml/validation/Schema.h b/libjava/javax/xml/validation/Schema.h
deleted file mode 100644
index 482a216d26b..00000000000
--- a/libjava/javax/xml/validation/Schema.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_Schema__
-#define __javax_xml_validation_Schema__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class Schema;
-          class Validator;
-          class ValidatorHandler;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::Schema : public ::java::lang::Object
-{
-
-public: // actually protected
-  Schema();
-public:
-  virtual ::javax::xml::validation::Validator * newValidator() = 0;
-  virtual ::javax::xml::validation::ValidatorHandler * newValidatorHandler() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_Schema__
diff --git a/libjava/javax/xml/validation/SchemaFactory.h b/libjava/javax/xml/validation/SchemaFactory.h
deleted file mode 100644
index 758e376843d..00000000000
--- a/libjava/javax/xml/validation/SchemaFactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_SchemaFactory__
-#define __javax_xml_validation_SchemaFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-      }
-      namespace validation
-      {
-          class Schema;
-          class SchemaFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::SchemaFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  SchemaFactory();
-public:
-  static ::javax::xml::validation::SchemaFactory * newInstance(::java::lang::String *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, ::java::lang::String *, jint);
-public:
-  virtual jboolean isSchemaLanguageSupported(::java::lang::String *) = 0;
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler() = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver() = 0;
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *) = 0;
-  virtual ::javax::xml::validation::Schema * newSchema(::javax::xml::transform::Source *);
-  virtual ::javax::xml::validation::Schema * newSchema(::java::io::File *);
-  virtual ::javax::xml::validation::Schema * newSchema(::java::net::URL *);
-  virtual ::javax::xml::validation::Schema * newSchema(JArray< ::javax::xml::transform::Source * > *) = 0;
-  virtual ::javax::xml::validation::Schema * newSchema() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_SchemaFactory__
diff --git a/libjava/javax/xml/validation/SchemaFactoryLoader.h b/libjava/javax/xml/validation/SchemaFactoryLoader.h
deleted file mode 100644
index 0593c5474dd..00000000000
--- a/libjava/javax/xml/validation/SchemaFactoryLoader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_SchemaFactoryLoader__
-#define __javax_xml_validation_SchemaFactoryLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class SchemaFactory;
-          class SchemaFactoryLoader;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::SchemaFactoryLoader : public ::java::lang::Object
-{
-
-public: // actually protected
-  SchemaFactoryLoader();
-public:
-  virtual ::javax::xml::validation::SchemaFactory * newFactory(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_SchemaFactoryLoader__
diff --git a/libjava/javax/xml/validation/TypeInfoProvider.h b/libjava/javax/xml/validation/TypeInfoProvider.h
deleted file mode 100644
index 0a363268808..00000000000
--- a/libjava/javax/xml/validation/TypeInfoProvider.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_TypeInfoProvider__
-#define __javax_xml_validation_TypeInfoProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class TypeInfoProvider;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::TypeInfoProvider : public ::java::lang::Object
-{
-
-public: // actually protected
-  TypeInfoProvider();
-public:
-  virtual ::org::w3c::dom::TypeInfo * getElementTypeInfo() = 0;
-  virtual ::org::w3c::dom::TypeInfo * getAttributeTypeInfo(jint) = 0;
-  virtual jboolean isIdAttribute(jint) = 0;
-  virtual jboolean isSpecified(jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_TypeInfoProvider__
diff --git a/libjava/javax/xml/validation/Validator.h b/libjava/javax/xml/validation/Validator.h
deleted file mode 100644
index 98dcf2862f2..00000000000
--- a/libjava/javax/xml/validation/Validator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_Validator__
-#define __javax_xml_validation_Validator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Source;
-      }
-      namespace validation
-      {
-          class Validator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::Validator : public ::java::lang::Object
-{
-
-public: // actually protected
-  Validator();
-public:
-  virtual void reset() = 0;
-  virtual void validate(::javax::xml::transform::Source *);
-  virtual void validate(::javax::xml::transform::Source *, ::javax::xml::transform::Result *) = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler() = 0;
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *) = 0;
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver() = 0;
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_Validator__
diff --git a/libjava/javax/xml/validation/ValidatorHandler.h b/libjava/javax/xml/validation/ValidatorHandler.h
deleted file mode 100644
index a5f9e2f010c..00000000000
--- a/libjava/javax/xml/validation/ValidatorHandler.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_ValidatorHandler__
-#define __javax_xml_validation_ValidatorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class TypeInfoProvider;
-          class ValidatorHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ContentHandler;
-          class ErrorHandler;
-          class Locator;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::ValidatorHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  ValidatorHandler();
-public:
-  virtual void setContentHandler(::org::xml::sax::ContentHandler *) = 0;
-  virtual ::org::xml::sax::ContentHandler * getContentHandler() = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler() = 0;
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *) = 0;
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver() = 0;
-  virtual ::javax::xml::validation::TypeInfoProvider * getTypeInfoProvider() = 0;
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual void setDocumentLocator(::org::xml::sax::Locator *) = 0;
-  virtual void startDocument() = 0;
-  virtual void endDocument() = 0;
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endPrefixMapping(::java::lang::String *) = 0;
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *) = 0;
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint) = 0;
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void skippedEntity(::java::lang::String *) = 0;
-public: // actually package-private
-  static ::java::lang::String * NS_FEATURE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_ValidatorHandler__
diff --git a/libjava/javax/xml/xpath/XPath.h b/libjava/javax/xml/xpath/XPath.h
deleted file mode 100644
index a19cd75432d..00000000000
--- a/libjava/javax/xml/xpath/XPath.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPath__
-#define __javax_xml_xpath_XPath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPath;
-          class XPathExpression;
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPath : public ::java::lang::Object
-{
-
-public:
-  virtual void reset() = 0;
-  virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *) = 0;
-  virtual ::javax::xml::xpath::XPathVariableResolver * getXPathVariableResolver() = 0;
-  virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *) = 0;
-  virtual ::javax::xml::xpath::XPathFunctionResolver * getXPathFunctionResolver() = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
-  virtual ::javax::xml::xpath::XPathExpression * compile(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace$::QName *) = 0;
-  virtual ::java::lang::String * evaluate(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *) = 0;
-  virtual ::java::lang::String * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPath__
diff --git a/libjava/javax/xml/xpath/XPathConstants.h b/libjava/javax/xml/xpath/XPathConstants.h
deleted file mode 100644
index 5cb800ce46e..00000000000
--- a/libjava/javax/xml/xpath/XPathConstants.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathConstants__
-#define __javax_xml_xpath_XPathConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathConstants;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathConstants : public ::java::lang::Object
-{
-
-  XPathConstants();
-public:
-  static ::javax::xml::namespace$::QName * NUMBER;
-  static ::javax::xml::namespace$::QName * STRING;
-  static ::javax::xml::namespace$::QName * BOOLEAN;
-  static ::javax::xml::namespace$::QName * NODESET;
-  static ::javax::xml::namespace$::QName * NODE;
-  static ::java::lang::String * DOM_OBJECT_MODEL;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathConstants__
diff --git a/libjava/javax/xml/xpath/XPathException.h b/libjava/javax/xml/xpath/XPathException.h
deleted file mode 100644
index a495a94233e..00000000000
--- a/libjava/javax/xml/xpath/XPathException.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathException__
-#define __javax_xml_xpath_XPathException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathException;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathException : public ::java::lang::Exception
-{
-
-public:
-  XPathException(::java::lang::String *);
-  XPathException(::java::lang::Throwable *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = -1837080260374986980LL;
-public: // actually package-private
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) cause;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathException__
diff --git a/libjava/javax/xml/xpath/XPathExpression.h b/libjava/javax/xml/xpath/XPathExpression.h
deleted file mode 100644
index 389e5f69d9a..00000000000
--- a/libjava/javax/xml/xpath/XPathExpression.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathExpression__
-#define __javax_xml_xpath_XPathExpression__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathExpression;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathExpression : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace$::QName *) = 0;
-  virtual ::java::lang::String * evaluate(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *) = 0;
-  virtual ::java::lang::String * evaluate(::org::xml::sax::InputSource *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPathExpression__
diff --git a/libjava/javax/xml/xpath/XPathExpressionException.h b/libjava/javax/xml/xpath/XPathExpressionException.h
deleted file mode 100644
index e619bbd62b6..00000000000
--- a/libjava/javax/xml/xpath/XPathExpressionException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathExpressionException__
-#define __javax_xml_xpath_XPathExpressionException__
-
-#pragma interface
-
-#include <javax/xml/xpath/XPathException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathExpressionException;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathExpressionException : public ::javax::xml::xpath::XPathException
-{
-
-public:
-  XPathExpressionException(::java::lang::String *);
-  XPathExpressionException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1837080260374986980LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathExpressionException__
diff --git a/libjava/javax/xml/xpath/XPathFactory.h b/libjava/javax/xml/xpath/XPathFactory.h
deleted file mode 100644
index f4b9ac68554..00000000000
--- a/libjava/javax/xml/xpath/XPathFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFactory__
-#define __javax_xml_xpath_XPathFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPath;
-          class XPathFactory;
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathFactory();
-public:
-  static ::javax::xml::xpath::XPathFactory * newInstance();
-  static ::javax::xml::xpath::XPathFactory * newInstance(::java::lang::String *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual jboolean isObjectModelSupported(::java::lang::String *) = 0;
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-  virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *) = 0;
-  virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *) = 0;
-  virtual ::javax::xml::xpath::XPath * newXPath() = 0;
-  static ::java::lang::String * DEFAULT_PROPERTY_NAME;
-  static ::java::lang::String * DEFAULT_OBJECT_MODEL_URI;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathFactory__
diff --git a/libjava/javax/xml/xpath/XPathFactoryConfigurationException.h b/libjava/javax/xml/xpath/XPathFactoryConfigurationException.h
deleted file mode 100644
index 35ee44255f1..00000000000
--- a/libjava/javax/xml/xpath/XPathFactoryConfigurationException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFactoryConfigurationException__
-#define __javax_xml_xpath_XPathFactoryConfigurationException__
-
-#pragma interface
-
-#include <javax/xml/xpath/XPathException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathFactoryConfigurationException;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFactoryConfigurationException : public ::javax::xml::xpath::XPathException
-{
-
-public:
-  XPathFactoryConfigurationException(::java::lang::String *);
-  XPathFactoryConfigurationException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1837080260374986980LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathFactoryConfigurationException__
diff --git a/libjava/javax/xml/xpath/XPathFunction.h b/libjava/javax/xml/xpath/XPathFunction.h
deleted file mode 100644
index adc76361280..00000000000
--- a/libjava/javax/xml/xpath/XPathFunction.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFunction__
-#define __javax_xml_xpath_XPathFunction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathFunction;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFunction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * evaluate(::java::util::List *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPathFunction__
diff --git a/libjava/javax/xml/xpath/XPathFunctionException.h b/libjava/javax/xml/xpath/XPathFunctionException.h
deleted file mode 100644
index 690332a2efd..00000000000
--- a/libjava/javax/xml/xpath/XPathFunctionException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFunctionException__
-#define __javax_xml_xpath_XPathFunctionException__
-
-#pragma interface
-
-#include <javax/xml/xpath/XPathExpressionException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathFunctionException;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFunctionException : public ::javax::xml::xpath::XPathExpressionException
-{
-
-public:
-  XPathFunctionException(::java::lang::String *);
-  XPathFunctionException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1837080260374986980LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathFunctionException__
diff --git a/libjava/javax/xml/xpath/XPathFunctionResolver.h b/libjava/javax/xml/xpath/XPathFunctionResolver.h
deleted file mode 100644
index 106122767a3..00000000000
--- a/libjava/javax/xml/xpath/XPathFunctionResolver.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFunctionResolver__
-#define __javax_xml_xpath_XPathFunctionResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathFunction;
-          class XPathFunctionResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFunctionResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace$::QName *, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPathFunctionResolver__
diff --git a/libjava/javax/xml/xpath/XPathVariableResolver.h b/libjava/javax/xml/xpath/XPathVariableResolver.h
deleted file mode 100644
index dfbd63592b1..00000000000
--- a/libjava/javax/xml/xpath/XPathVariableResolver.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathVariableResolver__
-#define __javax_xml_xpath_XPathVariableResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace$
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathVariableResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathVariableResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace$::QName *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPathVariableResolver__