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

439 files changed, 0 insertions, 26057 deletions

diff --git a/libjava/java/awt/AWTError.h b/libjava/java/awt/AWTError.h
deleted file mode 100644
index bcfbd634ccb..00000000000
--- a/libjava/java/awt/AWTError.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTError__
-#define __java_awt_AWTError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTError;
-    }
-  }
-}
-
-class java::awt::AWTError : public ::java::lang::Error
-{
-
-public:
-  AWTError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1819846354050686206LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTError__
diff --git a/libjava/java/awt/AWTEvent.h b/libjava/java/awt/AWTEvent.h
deleted file mode 100644
index 94d090a9ff5..00000000000
--- a/libjava/java/awt/AWTEvent.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTEvent__
-#define __java_awt_AWTEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Event;
-    }
-  }
-}
-
-class java::awt::AWTEvent : public ::java::util::EventObject
-{
-
-public:
-  AWTEvent(::java::awt::Event *);
-  AWTEvent(::java::lang::Object *, jint);
-  virtual void setSource(::java::lang::Object *);
-  virtual jint getID();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * paramString();
-public: // actually protected
-  virtual void consume();
-  virtual jboolean isConsumed();
-public: // actually package-private
-  static jlong eventIdToMask(jint);
-private:
-  static const jlong serialVersionUID = -1825314779160409405LL;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) id;
-  jboolean consumed;
-public: // actually package-private
-  ::java::awt::AWTEvent * queueNext;
-  JArray< jbyte > * bdata;
-  jboolean isFocusManagerEvent;
-public:
-  static const jlong COMPONENT_EVENT_MASK = 1LL;
-  static const jlong CONTAINER_EVENT_MASK = 2LL;
-  static const jlong FOCUS_EVENT_MASK = 4LL;
-  static const jlong KEY_EVENT_MASK = 8LL;
-  static const jlong MOUSE_EVENT_MASK = 16LL;
-  static const jlong MOUSE_MOTION_EVENT_MASK = 32LL;
-  static const jlong WINDOW_EVENT_MASK = 64LL;
-  static const jlong ACTION_EVENT_MASK = 128LL;
-  static const jlong ADJUSTMENT_EVENT_MASK = 256LL;
-  static const jlong ITEM_EVENT_MASK = 512LL;
-  static const jlong TEXT_EVENT_MASK = 1024LL;
-  static const jlong INPUT_METHOD_EVENT_MASK = 2048LL;
-public: // actually package-private
-  static const jlong INPUT_ENABLED_EVENT_MASK = 4096LL;
-public:
-  static const jlong PAINT_EVENT_MASK = 8192LL;
-  static const jlong INVOCATION_EVENT_MASK = 16384LL;
-  static const jlong HIERARCHY_EVENT_MASK = 32768LL;
-  static const jlong HIERARCHY_BOUNDS_EVENT_MASK = 65536LL;
-  static const jlong MOUSE_WHEEL_EVENT_MASK = 131072LL;
-  static const jlong WINDOW_STATE_EVENT_MASK = 262144LL;
-  static const jlong WINDOW_FOCUS_EVENT_MASK = 524288LL;
-  static const jint RESERVED_ID_MAX = 1999;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTEvent__
diff --git a/libjava/java/awt/AWTEventMulticaster.h b/libjava/java/awt/AWTEventMulticaster.h
deleted file mode 100644
index cb5d0243ac3..00000000000
--- a/libjava/java/awt/AWTEventMulticaster.h
+++ /dev/null
@@ -1,151 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTEventMulticaster__
-#define __java_awt_AWTEventMulticaster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEventMulticaster;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class AdjustmentEvent;
-          class AdjustmentListener;
-          class ComponentEvent;
-          class ComponentListener;
-          class ContainerEvent;
-          class ContainerListener;
-          class FocusEvent;
-          class FocusListener;
-          class HierarchyBoundsListener;
-          class HierarchyEvent;
-          class HierarchyListener;
-          class InputMethodEvent;
-          class InputMethodListener;
-          class ItemEvent;
-          class ItemListener;
-          class KeyEvent;
-          class KeyListener;
-          class MouseEvent;
-          class MouseListener;
-          class MouseMotionListener;
-          class MouseWheelEvent;
-          class MouseWheelListener;
-          class TextEvent;
-          class TextListener;
-          class WindowEvent;
-          class WindowFocusListener;
-          class WindowListener;
-          class WindowStateListener;
-      }
-    }
-  }
-}
-
-class java::awt::AWTEventMulticaster : public ::java::lang::Object
-{
-
-public: // actually protected
-  AWTEventMulticaster(::java::util::EventListener *, ::java::util::EventListener *);
-  virtual ::java::util::EventListener * remove(::java::util::EventListener *);
-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 *);
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-  virtual void keyTyped(::java::awt::event::KeyEvent *);
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-  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 *);
-  virtual void windowOpened(::java::awt::event::WindowEvent *);
-  virtual void windowClosing(::java::awt::event::WindowEvent *);
-  virtual void windowClosed(::java::awt::event::WindowEvent *);
-  virtual void windowIconified(::java::awt::event::WindowEvent *);
-  virtual void windowDeiconified(::java::awt::event::WindowEvent *);
-  virtual void windowActivated(::java::awt::event::WindowEvent *);
-  virtual void windowDeactivated(::java::awt::event::WindowEvent *);
-  virtual void windowStateChanged(::java::awt::event::WindowEvent *);
-  virtual void windowGainedFocus(::java::awt::event::WindowEvent *);
-  virtual void windowLostFocus(::java::awt::event::WindowEvent *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void adjustmentValueChanged(::java::awt::event::AdjustmentEvent *);
-  virtual void textValueChanged(::java::awt::event::TextEvent *);
-  virtual void inputMethodTextChanged(::java::awt::event::InputMethodEvent *);
-  virtual void caretPositionChanged(::java::awt::event::InputMethodEvent *);
-  virtual void hierarchyChanged(::java::awt::event::HierarchyEvent *);
-  virtual void ancestorMoved(::java::awt::event::HierarchyEvent *);
-  virtual void ancestorResized(::java::awt::event::HierarchyEvent *);
-  virtual void mouseWheelMoved(::java::awt::event::MouseWheelEvent *);
-  static ::java::awt::event::ComponentListener * add(::java::awt::event::ComponentListener *, ::java::awt::event::ComponentListener *);
-  static ::java::awt::event::ContainerListener * add(::java::awt::event::ContainerListener *, ::java::awt::event::ContainerListener *);
-  static ::java::awt::event::FocusListener * add(::java::awt::event::FocusListener *, ::java::awt::event::FocusListener *);
-  static ::java::awt::event::KeyListener * add(::java::awt::event::KeyListener *, ::java::awt::event::KeyListener *);
-  static ::java::awt::event::MouseListener * add(::java::awt::event::MouseListener *, ::java::awt::event::MouseListener *);
-  static ::java::awt::event::MouseMotionListener * add(::java::awt::event::MouseMotionListener *, ::java::awt::event::MouseMotionListener *);
-  static ::java::awt::event::WindowListener * add(::java::awt::event::WindowListener *, ::java::awt::event::WindowListener *);
-  static ::java::awt::event::WindowStateListener * add(::java::awt::event::WindowStateListener *, ::java::awt::event::WindowStateListener *);
-  static ::java::awt::event::WindowFocusListener * add(::java::awt::event::WindowFocusListener *, ::java::awt::event::WindowFocusListener *);
-  static ::java::awt::event::ActionListener * add(::java::awt::event::ActionListener *, ::java::awt::event::ActionListener *);
-  static ::java::awt::event::ItemListener * add(::java::awt::event::ItemListener *, ::java::awt::event::ItemListener *);
-  static ::java::awt::event::AdjustmentListener * add(::java::awt::event::AdjustmentListener *, ::java::awt::event::AdjustmentListener *);
-  static ::java::awt::event::TextListener * add(::java::awt::event::TextListener *, ::java::awt::event::TextListener *);
-  static ::java::awt::event::InputMethodListener * add(::java::awt::event::InputMethodListener *, ::java::awt::event::InputMethodListener *);
-  static ::java::awt::event::HierarchyListener * add(::java::awt::event::HierarchyListener *, ::java::awt::event::HierarchyListener *);
-  static ::java::awt::event::HierarchyBoundsListener * add(::java::awt::event::HierarchyBoundsListener *, ::java::awt::event::HierarchyBoundsListener *);
-  static ::java::awt::event::MouseWheelListener * add(::java::awt::event::MouseWheelListener *, ::java::awt::event::MouseWheelListener *);
-  static ::java::awt::event::ComponentListener * remove(::java::awt::event::ComponentListener *, ::java::awt::event::ComponentListener *);
-  static ::java::awt::event::ContainerListener * remove(::java::awt::event::ContainerListener *, ::java::awt::event::ContainerListener *);
-  static ::java::awt::event::FocusListener * remove(::java::awt::event::FocusListener *, ::java::awt::event::FocusListener *);
-  static ::java::awt::event::KeyListener * remove(::java::awt::event::KeyListener *, ::java::awt::event::KeyListener *);
-  static ::java::awt::event::MouseListener * remove(::java::awt::event::MouseListener *, ::java::awt::event::MouseListener *);
-  static ::java::awt::event::MouseMotionListener * remove(::java::awt::event::MouseMotionListener *, ::java::awt::event::MouseMotionListener *);
-  static ::java::awt::event::WindowListener * remove(::java::awt::event::WindowListener *, ::java::awt::event::WindowListener *);
-  static ::java::awt::event::WindowStateListener * remove(::java::awt::event::WindowStateListener *, ::java::awt::event::WindowStateListener *);
-  static ::java::awt::event::WindowFocusListener * remove(::java::awt::event::WindowFocusListener *, ::java::awt::event::WindowFocusListener *);
-  static ::java::awt::event::ActionListener * remove(::java::awt::event::ActionListener *, ::java::awt::event::ActionListener *);
-  static ::java::awt::event::ItemListener * remove(::java::awt::event::ItemListener *, ::java::awt::event::ItemListener *);
-  static ::java::awt::event::AdjustmentListener * remove(::java::awt::event::AdjustmentListener *, ::java::awt::event::AdjustmentListener *);
-  static ::java::awt::event::TextListener * remove(::java::awt::event::TextListener *, ::java::awt::event::TextListener *);
-  static ::java::awt::event::InputMethodListener * remove(::java::awt::event::InputMethodListener *, ::java::awt::event::InputMethodListener *);
-  static ::java::awt::event::HierarchyListener * remove(::java::awt::event::HierarchyListener *, ::java::awt::event::HierarchyListener *);
-  static ::java::awt::event::HierarchyBoundsListener * remove(::java::awt::event::HierarchyBoundsListener *, ::java::awt::event::HierarchyBoundsListener *);
-  static ::java::awt::event::MouseWheelListener * remove(::java::awt::event::MouseWheelListener *, ::java::awt::event::MouseWheelListener *);
-public: // actually protected
-  static ::java::util::EventListener * addInternal(::java::util::EventListener *, ::java::util::EventListener *);
-  static ::java::util::EventListener * removeInternal(::java::util::EventListener *, ::java::util::EventListener *);
-  virtual void saveInternal(::java::io::ObjectOutputStream *, ::java::lang::String *);
-  static void save(::java::io::ObjectOutputStream *, ::java::lang::String *, ::java::util::EventListener *);
-public:
-  static JArray< ::java::util::EventListener * > * getListeners(::java::util::EventListener *, ::java::lang::Class *);
-private:
-  void getListeners(::java::util::ArrayList *, ::java::lang::Class *);
-public: // actually protected
-  ::java::util::EventListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) a;
-  ::java::util::EventListener * b;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTEventMulticaster__
diff --git a/libjava/java/awt/AWTException.h b/libjava/java/awt/AWTException.h
deleted file mode 100644
index fdda1bde25b..00000000000
--- a/libjava/java/awt/AWTException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTException__
-#define __java_awt_AWTException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTException;
-    }
-  }
-}
-
-class java::awt::AWTException : public ::java::lang::Exception
-{
-
-public:
-  AWTException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1900414231151323879LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTException__
diff --git a/libjava/java/awt/AWTKeyStroke$1.h b/libjava/java/awt/AWTKeyStroke$1.h
deleted file mode 100644
index 15805dad88b..00000000000
--- a/libjava/java/awt/AWTKeyStroke$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTKeyStroke$1__
-#define __java_awt_AWTKeyStroke$1__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTKeyStroke$1;
-    }
-  }
-}
-
-class java::awt::AWTKeyStroke$1 : public ::java::util::LinkedHashMap
-{
-
-public: // actually package-private
-  AWTKeyStroke$1(jint, jfloat, jboolean);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-private:
-  static const jint MAX_CACHE_SIZE = 2048;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTKeyStroke$1__
diff --git a/libjava/java/awt/AWTKeyStroke$2.h b/libjava/java/awt/AWTKeyStroke$2.h
deleted file mode 100644
index 0117323aae1..00000000000
--- a/libjava/java/awt/AWTKeyStroke$2.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTKeyStroke$2__
-#define __java_awt_AWTKeyStroke$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTKeyStroke$2;
-    }
-  }
-}
-
-class java::awt::AWTKeyStroke$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AWTKeyStroke$2();
-public:
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTKeyStroke$2__
diff --git a/libjava/java/awt/AWTKeyStroke$3.h b/libjava/java/awt/AWTKeyStroke$3.h
deleted file mode 100644
index 94238cef1c0..00000000000
--- a/libjava/java/awt/AWTKeyStroke$3.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTKeyStroke$3__
-#define __java_awt_AWTKeyStroke$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTKeyStroke$3;
-    }
-  }
-}
-
-class java::awt::AWTKeyStroke$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AWTKeyStroke$3(::java::lang::Class *);
-public:
-  virtual ::java::lang::Object * run();
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$subclass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTKeyStroke$3__
diff --git a/libjava/java/awt/AWTKeyStroke.h b/libjava/java/awt/AWTKeyStroke.h
deleted file mode 100644
index 0b0032dd8b0..00000000000
--- a/libjava/java/awt/AWTKeyStroke.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTKeyStroke__
-#define __java_awt_AWTKeyStroke__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTKeyStroke;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::AWTKeyStroke : public ::java::lang::Object
-{
-
-public: // actually protected
-  AWTKeyStroke();
-  AWTKeyStroke(jchar, jint, jint, jboolean);
-  static void registerSubclass(::java::lang::Class *);
-public:
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(jchar);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(::java::lang::Character *, jint);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(jint, jint, jboolean);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(jint, jint);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStrokeForEvent(::java::awt::event::KeyEvent *);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(::java::lang::String *);
-  virtual jchar getKeyChar();
-  virtual jint getKeyCode();
-  virtual jint getModifiers();
-  virtual jboolean isOnKeyRelease();
-  virtual jint getKeyEventType();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual ::java::lang::Object * readResolve();
-private:
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(jchar, jint, jint, jboolean);
-  static jint extend(jint);
-  static const jlong serialVersionUID = -6430539691155161871LL;
-  static const jint MODIFIERS_MASK = 16367;
-  static ::java::util::LinkedHashMap * cache;
-  static ::java::awt::AWTKeyStroke * recent;
-  static ::java::lang::reflect::Constructor * ctor;
-public: // actually package-private
-  static ::java::util::HashMap * vktable;
-private:
-  jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyChar;
-public: // actually package-private
-  jint keyCode;
-private:
-  jint modifiers;
-  jboolean onKeyRelease;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTKeyStroke__
diff --git a/libjava/java/awt/AWTPermission.h b/libjava/java/awt/AWTPermission.h
deleted file mode 100644
index 4936c3dad27..00000000000
--- a/libjava/java/awt/AWTPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTPermission__
-#define __java_awt_AWTPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTPermission;
-    }
-  }
-}
-
-class java::awt::AWTPermission : public ::java::security::BasicPermission
-{
-
-public:
-  AWTPermission(::java::lang::String *);
-  AWTPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8890392402588814465LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTPermission__
diff --git a/libjava/java/awt/ActiveEvent.h b/libjava/java/awt/ActiveEvent.h
deleted file mode 100644
index a2183cfe1a9..00000000000
--- a/libjava/java/awt/ActiveEvent.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ActiveEvent__
-#define __java_awt_ActiveEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ActiveEvent;
-    }
-  }
-}
-
-class java::awt::ActiveEvent : public ::java::lang::Object
-{
-
-public:
-  virtual void dispatch() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_ActiveEvent__
diff --git a/libjava/java/awt/Adjustable.h b/libjava/java/awt/Adjustable.h
deleted file mode 100644
index 9460f529a85..00000000000
--- a/libjava/java/awt/Adjustable.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Adjustable__
-#define __java_awt_Adjustable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-      namespace event
-      {
-          class AdjustmentListener;
-      }
-    }
-  }
-}
-
-class java::awt::Adjustable : public ::java::lang::Object
-{
-
-public:
-  virtual jint getOrientation() = 0;
-  virtual void setMinimum(jint) = 0;
-  virtual jint getMinimum() = 0;
-  virtual void setMaximum(jint) = 0;
-  virtual jint getMaximum() = 0;
-  virtual void setUnitIncrement(jint) = 0;
-  virtual jint getUnitIncrement() = 0;
-  virtual void setBlockIncrement(jint) = 0;
-  virtual jint getBlockIncrement() = 0;
-  virtual void setVisibleAmount(jint) = 0;
-  virtual jint getVisibleAmount() = 0;
-  virtual void setValue(jint) = 0;
-  virtual jint getValue() = 0;
-  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *) = 0;
-  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *) = 0;
-  static const jint HORIZONTAL = 0;
-  static const jint VERTICAL = 1;
-  static const jint NO_ORIENTATION = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Adjustable__
diff --git a/libjava/java/awt/AlphaComposite$1.h b/libjava/java/awt/AlphaComposite$1.h
deleted file mode 100644
index 1bc20fa28b5..00000000000
--- a/libjava/java/awt/AlphaComposite$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AlphaComposite$1__
-#define __java_awt_AlphaComposite$1__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AlphaComposite$1;
-    }
-  }
-}
-
-class java::awt::AlphaComposite$1 : public ::java::util::LinkedHashMap
-{
-
-public: // actually package-private
-  AlphaComposite$1(jint, jfloat, jboolean);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-private:
-  static const jint MAX_CACHE_SIZE = 2048;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AlphaComposite$1__
diff --git a/libjava/java/awt/AlphaComposite.h b/libjava/java/awt/AlphaComposite.h
deleted file mode 100644
index 2113fb86de9..00000000000
--- a/libjava/java/awt/AlphaComposite.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AlphaComposite__
-#define __java_awt_AlphaComposite__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AlphaComposite;
-        class CompositeContext;
-        class RenderingHints;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::AlphaComposite : public ::java::lang::Object
-{
-
-  AlphaComposite(jint, jfloat);
-public:
-  static ::java::awt::AlphaComposite * getInstance(jint);
-  static ::java::awt::AlphaComposite * getInstance(jint, jfloat);
-  ::java::awt::CompositeContext * createContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *);
-  ::java::awt::AlphaComposite * derive(jint);
-  ::java::awt::AlphaComposite * derive(jfloat);
-  jfloat getAlpha();
-  jint getRule();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-private:
-  static ::java::util::LinkedHashMap * cache;
-public:
-  static const jint CLEAR = 1;
-  static const jint SRC = 2;
-  static const jint DST = 9;
-  static const jint SRC_OVER = 3;
-  static const jint DST_OVER = 4;
-  static const jint SRC_IN = 5;
-  static const jint DST_IN = 6;
-  static const jint SRC_OUT = 7;
-  static const jint DST_OUT = 8;
-  static const jint SRC_ATOP = 10;
-  static const jint DST_ATOP = 11;
-  static const jint XOR = 12;
-  static ::java::awt::AlphaComposite * Clear;
-  static ::java::awt::AlphaComposite * Src;
-  static ::java::awt::AlphaComposite * Dst;
-  static ::java::awt::AlphaComposite * SrcOver;
-  static ::java::awt::AlphaComposite * DstOver;
-  static ::java::awt::AlphaComposite * SrcIn;
-  static ::java::awt::AlphaComposite * DstIn;
-  static ::java::awt::AlphaComposite * SrcOut;
-  static ::java::awt::AlphaComposite * DstOut;
-  static ::java::awt::AlphaComposite * SrcAtop;
-  static ::java::awt::AlphaComposite * DstAtop;
-  static ::java::awt::AlphaComposite * Xor;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) rule;
-  jfloat alpha;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AlphaComposite__
diff --git a/libjava/java/awt/AttributeValue.h b/libjava/java/awt/AttributeValue.h
deleted file mode 100644
index 36294940b7e..00000000000
--- a/libjava/java/awt/AttributeValue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AttributeValue__
-#define __java_awt_AttributeValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AttributeValue;
-    }
-  }
-}
-
-class java::awt::AttributeValue : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AttributeValue(jint, JArray< ::java::lang::String * > *);
-public:
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  JArray< ::java::lang::String * > * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AttributeValue__
diff --git a/libjava/java/awt/BasicStroke.h b/libjava/java/awt/BasicStroke.h
deleted file mode 100644
index c3a92343504..00000000000
--- a/libjava/java/awt/BasicStroke.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_BasicStroke__
-#define __java_awt_BasicStroke__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace java2d
-        {
-            class Segment;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class BasicStroke;
-        class Shape;
-      namespace geom
-      {
-          class GeneralPath;
-          class PathIterator;
-          class Point2D;
-      }
-    }
-  }
-}
-
-class java::awt::BasicStroke : public ::java::lang::Object
-{
-
-public:
-  BasicStroke(jfloat, jint, jint, jfloat, JArray< jfloat > *, jfloat);
-  BasicStroke(jfloat, jint, jint, jfloat);
-  BasicStroke(jfloat, jint, jint);
-  BasicStroke(jfloat);
-  BasicStroke();
-  virtual ::java::awt::Shape * createStrokedShape(::java::awt::Shape *);
-  virtual jfloat getLineWidth();
-  virtual jint getEndCap();
-  virtual jint getLineJoin();
-  virtual jfloat getMiterLimit();
-  virtual JArray< jfloat > * getDashArray();
-  virtual jfloat getDashPhase();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  ::java::awt::Shape * solidStroke(::java::awt::geom::PathIterator *);
-  ::java::awt::Shape * dashedStroke(::java::awt::geom::PathIterator *);
-  void capEnds();
-  void convertPath(::java::awt::geom::GeneralPath *, ::gnu::java::awt::java2d::Segment *);
-  void addSegments(JArray< ::gnu::java::awt::java2d::Segment * > *);
-  void joinSegments(JArray< ::gnu::java::awt::java2d::Segment * > *);
-  void capEnd(::gnu::java::awt::java2d::Segment *, ::gnu::java::awt::java2d::Segment *);
-  ::java::awt::geom::Point2D * lineIntersection(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jboolean);
-  void joinOuterSegments(::gnu::java::awt::java2d::Segment *, ::gnu::java::awt::java2d::Segment *, ::java::awt::geom::Point2D *);
-  void joinInnerSegments(::gnu::java::awt::java2d::Segment *, ::gnu::java::awt::java2d::Segment *, ::java::awt::geom::Point2D *);
-public:
-  static const jint JOIN_MITER = 0;
-  static const jint JOIN_ROUND = 1;
-  static const jint JOIN_BEVEL = 2;
-  static const jint CAP_BUTT = 0;
-  static const jint CAP_ROUND = 1;
-  static const jint CAP_SQUARE = 2;
-private:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint cap;
-  jint join;
-  jfloat limit;
-  JArray< jfloat > * dash;
-  jfloat phase;
-  ::gnu::java::awt::java2d::Segment * start;
-  ::gnu::java::awt::java2d::Segment * end;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_BasicStroke__
diff --git a/libjava/java/awt/BorderLayout.h b/libjava/java/awt/BorderLayout.h
deleted file mode 100644
index f78e9716441..00000000000
--- a/libjava/java/awt/BorderLayout.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_BorderLayout__
-#define __java_awt_BorderLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BorderLayout;
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-}
-
-class java::awt::BorderLayout : public ::java::lang::Object
-{
-
-public:
-  BorderLayout();
-  BorderLayout(jint, jint);
-  virtual jint getHgap();
-  virtual void setHgap(jint);
-  virtual jint getVgap();
-  virtual void setVgap(jint);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::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 invalidateLayout(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::awt::Dimension * calcCompSize(::java::awt::Component *, jint);
-  ::java::awt::Dimension * calcSize(::java::awt::Container *, jint);
-public:
-  virtual ::java::awt::Component * getLayoutComponent(::java::lang::Object *);
-  virtual ::java::awt::Component * getLayoutComponent(::java::awt::Container *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getConstraints(::java::awt::Component *);
-  static ::java::lang::String * NORTH;
-  static ::java::lang::String * SOUTH;
-  static ::java::lang::String * EAST;
-  static ::java::lang::String * WEST;
-  static ::java::lang::String * CENTER;
-  static ::java::lang::String * BEFORE_FIRST_LINE;
-  static ::java::lang::String * AFTER_LAST_LINE;
-  static ::java::lang::String * BEFORE_LINE_BEGINS;
-  static ::java::lang::String * AFTER_LINE_ENDS;
-  static ::java::lang::String * PAGE_START;
-  static ::java::lang::String * PAGE_END;
-  static ::java::lang::String * LINE_START;
-  static ::java::lang::String * LINE_END;
-private:
-  static const jlong serialVersionUID = -8658291919501921765LL;
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) north;
-  ::java::awt::Component * south;
-  ::java::awt::Component * east;
-  ::java::awt::Component * west;
-  ::java::awt::Component * center;
-  ::java::awt::Component * firstLine;
-  ::java::awt::Component * lastLine;
-  ::java::awt::Component * firstItem;
-  ::java::awt::Component * lastItem;
-  jint hgap;
-  jint vgap;
-  static const jint MIN = 0;
-  static const jint MAX = 1;
-  static const jint PREF = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_BorderLayout__
diff --git a/libjava/java/awt/BufferCapabilities$FlipContents.h b/libjava/java/awt/BufferCapabilities$FlipContents.h
deleted file mode 100644
index b5f45e4d020..00000000000
--- a/libjava/java/awt/BufferCapabilities$FlipContents.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_BufferCapabilities$FlipContents__
-#define __java_awt_BufferCapabilities$FlipContents__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities$FlipContents;
-    }
-  }
-}
-
-class java::awt::BufferCapabilities$FlipContents : public ::java::awt::AttributeValue
-{
-
-  BufferCapabilities$FlipContents(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::BufferCapabilities$FlipContents * UNDEFINED;
-  static ::java::awt::BufferCapabilities$FlipContents * BACKGROUND;
-  static ::java::awt::BufferCapabilities$FlipContents * PRIOR;
-  static ::java::awt::BufferCapabilities$FlipContents * COPIED;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_BufferCapabilities$FlipContents__
diff --git a/libjava/java/awt/BufferCapabilities.h b/libjava/java/awt/BufferCapabilities.h
deleted file mode 100644
index bda4b752c50..00000000000
--- a/libjava/java/awt/BufferCapabilities.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_BufferCapabilities__
-#define __java_awt_BufferCapabilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class ImageCapabilities;
-    }
-  }
-}
-
-class java::awt::BufferCapabilities : public ::java::lang::Object
-{
-
-public:
-  BufferCapabilities(::java::awt::ImageCapabilities *, ::java::awt::ImageCapabilities *, ::java::awt::BufferCapabilities$FlipContents *);
-  virtual ::java::awt::ImageCapabilities * getFrontBufferCapabilities();
-  virtual ::java::awt::ImageCapabilities * getBackBufferCapabilities();
-  virtual jboolean isPageFlipping();
-  virtual ::java::awt::BufferCapabilities$FlipContents * getFlipContents();
-  virtual jboolean isFullScreenRequired();
-  virtual jboolean isMultiBufferAvailable();
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::awt::ImageCapabilities * __attribute__((aligned(__alignof__( ::java::lang::Object)))) front;
-  ::java::awt::ImageCapabilities * back;
-  ::java::awt::BufferCapabilities$FlipContents * flip;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_BufferCapabilities__
diff --git a/libjava/java/awt/Button$AccessibleAWTButton.h b/libjava/java/awt/Button$AccessibleAWTButton.h
deleted file mode 100644
index be1dc9a11ac..00000000000
--- a/libjava/java/awt/Button$AccessibleAWTButton.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Button$AccessibleAWTButton__
-#define __java_awt_Button$AccessibleAWTButton__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Button$AccessibleAWTButton;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleRole;
-        class AccessibleValue;
-    }
-  }
-}
-
-class java::awt::Button$AccessibleAWTButton : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Button$AccessibleAWTButton(::java::awt::Button *);
-public:
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  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();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -5932203980244017102LL;
-public: // actually package-private
-  ::java::awt::Button * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Button$AccessibleAWTButton__
diff --git a/libjava/java/awt/Button.h b/libjava/java/awt/Button.h
deleted file mode 100644
index 19636de837a..00000000000
--- a/libjava/java/awt/Button.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Button__
-#define __java_awt_Button__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Button;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Button : public ::java::awt::Component
-{
-
-public:
-  Button();
-  Button(::java::lang::String *);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  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 JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void addNotify();
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processActionEvent(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = -8774683716313001058LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::Component)))) actionCommand;
-  ::java::lang::String * label;
-private:
-  ::java::awt::event::ActionListener * action_listeners;
-  static jlong next_button_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Button__
diff --git a/libjava/java/awt/Canvas$AccessibleAWTCanvas.h b/libjava/java/awt/Canvas$AccessibleAWTCanvas.h
deleted file mode 100644
index f4f6a3e37c1..00000000000
--- a/libjava/java/awt/Canvas$AccessibleAWTCanvas.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Canvas$AccessibleAWTCanvas__
-#define __java_awt_Canvas$AccessibleAWTCanvas__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Canvas$AccessibleAWTCanvas;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Canvas$AccessibleAWTCanvas : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Canvas$AccessibleAWTCanvas(::java::awt::Canvas *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -6325592262103146699LL;
-public: // actually package-private
-  ::java::awt::Canvas * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Canvas$AccessibleAWTCanvas__
diff --git a/libjava/java/awt/Canvas$CanvasBltBufferStrategy.h b/libjava/java/awt/Canvas$CanvasBltBufferStrategy.h
deleted file mode 100644
index f47ae70680a..00000000000
--- a/libjava/java/awt/Canvas$CanvasBltBufferStrategy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Canvas$CanvasBltBufferStrategy__
-#define __java_awt_Canvas$CanvasBltBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/Component$BltBufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Canvas$CanvasBltBufferStrategy;
-    }
-  }
-}
-
-class java::awt::Canvas$CanvasBltBufferStrategy : public ::java::awt::Component$BltBufferStrategy
-{
-
-public: // actually package-private
-  Canvas$CanvasBltBufferStrategy(::java::awt::Canvas *, jint, jboolean);
-  ::java::awt::Canvas * __attribute__((aligned(__alignof__( ::java::awt::Component$BltBufferStrategy)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Canvas$CanvasBltBufferStrategy__
diff --git a/libjava/java/awt/Canvas$CanvasFlipBufferStrategy.h b/libjava/java/awt/Canvas$CanvasFlipBufferStrategy.h
deleted file mode 100644
index 0af653f2c6d..00000000000
--- a/libjava/java/awt/Canvas$CanvasFlipBufferStrategy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Canvas$CanvasFlipBufferStrategy__
-#define __java_awt_Canvas$CanvasFlipBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/Component$FlipBufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Canvas$CanvasFlipBufferStrategy;
-    }
-  }
-}
-
-class java::awt::Canvas$CanvasFlipBufferStrategy : public ::java::awt::Component$FlipBufferStrategy
-{
-
-public: // actually package-private
-  Canvas$CanvasFlipBufferStrategy(::java::awt::Canvas *, jint);
-  ::java::awt::Canvas * __attribute__((aligned(__alignof__( ::java::awt::Component$FlipBufferStrategy)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Canvas$CanvasFlipBufferStrategy__
diff --git a/libjava/java/awt/Canvas.h b/libjava/java/awt/Canvas.h
deleted file mode 100644
index d7e031018fd..00000000000
--- a/libjava/java/awt/Canvas.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Canvas__
-#define __java_awt_Canvas__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class Canvas;
-        class Graphics;
-        class GraphicsConfiguration;
-      namespace image
-      {
-          class BufferStrategy;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Canvas : public ::java::awt::Component
-{
-
-public:
-  Canvas();
-  Canvas(::java::awt::GraphicsConfiguration *);
-  virtual void addNotify();
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void createBufferStrategy(jint);
-  virtual void createBufferStrategy(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::image::BufferStrategy * getBufferStrategy();
-  virtual void update(::java::awt::Graphics *);
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = -2284879212465893870LL;
-  static jlong next_canvas_number;
-public: // actually package-private
-  ::java::awt::image::BufferStrategy * __attribute__((aligned(__alignof__( ::java::awt::Component)))) bufferStrategy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Canvas__
diff --git a/libjava/java/awt/CardLayout.h b/libjava/java/awt/CardLayout.h
deleted file mode 100644
index 9affd84fbca..00000000000
--- a/libjava/java/awt/CardLayout.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CardLayout__
-#define __java_awt_CardLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class CardLayout;
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-}
-
-class java::awt::CardLayout : public ::java::lang::Object
-{
-
-public:
-  CardLayout();
-  CardLayout(jint, jint);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void first(::java::awt::Container *);
-  virtual jint getHgap();
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual jint getVgap();
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void last(::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 void next(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void previous(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void setHgap(jint);
-  virtual void setVgap(jint);
-  virtual void show(::java::awt::Container *, ::java::lang::String *);
-  virtual ::java::lang::String * toString();
-private:
-  void gotoComponent(::java::awt::Container *, jint);
-  ::java::awt::Dimension * getSize(::java::awt::Container *, jint);
-  static const jlong serialVersionUID = -4328196481005934313LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) hgap;
-  jint vgap;
-  ::java::util::Hashtable * tab;
-  static const jint FIRST = 0;
-  static const jint LAST = 1;
-  static const jint NEXT = 2;
-  static const jint PREV = 3;
-  static const jint MIN = 0;
-  static const jint MAX = 1;
-  static const jint PREF = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_CardLayout__
diff --git a/libjava/java/awt/Checkbox$AccessibleAWTCheckbox.h b/libjava/java/awt/Checkbox$AccessibleAWTCheckbox.h
deleted file mode 100644
index 025c42a37b6..00000000000
--- a/libjava/java/awt/Checkbox$AccessibleAWTCheckbox.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Checkbox$AccessibleAWTCheckbox__
-#define __java_awt_Checkbox$AccessibleAWTCheckbox__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class Checkbox$AccessibleAWTCheckbox;
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-  }
-}
-
-class java::awt::Checkbox$AccessibleAWTCheckbox : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  Checkbox$AccessibleAWTCheckbox(::java::awt::Checkbox *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-  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::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 7881579233144754107LL;
-public: // actually package-private
-  ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Checkbox$AccessibleAWTCheckbox__
diff --git a/libjava/java/awt/Checkbox.h b/libjava/java/awt/Checkbox.h
deleted file mode 100644
index 614f599f624..00000000000
--- a/libjava/java/awt/Checkbox.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Checkbox__
-#define __java_awt_Checkbox__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Checkbox;
-        class CheckboxGroup;
-      namespace event
-      {
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Checkbox : public ::java::awt::Component
-{
-
-public:
-  Checkbox();
-  Checkbox(::java::lang::String *);
-  Checkbox(::java::lang::String *, jboolean);
-  Checkbox(::java::lang::String *, ::java::awt::CheckboxGroup *, jboolean);
-  Checkbox(::java::lang::String *, jboolean, ::java::awt::CheckboxGroup *);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  virtual jboolean getState();
-  virtual void setState(jboolean);
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual ::java::awt::CheckboxGroup * getCheckboxGroup();
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *);
-  virtual void addNotify();
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processItemEvent(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = 7270714317450821763LL;
-  ::java::awt::CheckboxGroup * __attribute__((aligned(__alignof__( ::java::awt::Component)))) group;
-  ::java::lang::String * label;
-public: // actually package-private
-  jboolean state;
-private:
-  ::java::awt::event::ItemListener * item_listeners;
-  static jlong next_checkbox_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Checkbox__
diff --git a/libjava/java/awt/CheckboxGroup.h b/libjava/java/awt/CheckboxGroup.h
deleted file mode 100644
index 80a4557b3c4..00000000000
--- a/libjava/java/awt/CheckboxGroup.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CheckboxGroup__
-#define __java_awt_CheckboxGroup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class CheckboxGroup;
-    }
-  }
-}
-
-class java::awt::CheckboxGroup : public ::java::lang::Object
-{
-
-public:
-  CheckboxGroup();
-  virtual ::java::awt::Checkbox * getSelectedCheckbox();
-  virtual ::java::awt::Checkbox * getCurrent();
-  virtual void setSelectedCheckbox(::java::awt::Checkbox *);
-  virtual void setCurrent(::java::awt::Checkbox *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3729780091441768983LL;
-  ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selectedCheckbox;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_CheckboxGroup__
diff --git a/libjava/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.h b/libjava/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.h
deleted file mode 100644
index c9111835f4b..00000000000
--- a/libjava/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CheckboxMenuItem$AccessibleAWTCheckboxMenuItem__
-#define __java_awt_CheckboxMenuItem$AccessibleAWTCheckboxMenuItem__
-
-#pragma interface
-
-#include <java/awt/MenuItem$AccessibleAWTMenuItem.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class CheckboxMenuItem;
-        class CheckboxMenuItem$AccessibleAWTCheckboxMenuItem;
-    }
-  }
-}
-
-class java::awt::CheckboxMenuItem$AccessibleAWTCheckboxMenuItem : public ::java::awt::MenuItem$AccessibleAWTMenuItem
-{
-
-public: // actually protected
-  CheckboxMenuItem$AccessibleAWTCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-private:
-  static const jlong serialVersionUID = -1122642964303476LL;
-public: // actually package-private
-  ::java::awt::CheckboxMenuItem * __attribute__((aligned(__alignof__( ::java::awt::MenuItem$AccessibleAWTMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_CheckboxMenuItem$AccessibleAWTCheckboxMenuItem__
diff --git a/libjava/java/awt/CheckboxMenuItem.h b/libjava/java/awt/CheckboxMenuItem.h
deleted file mode 100644
index 52b7223cb28..00000000000
--- a/libjava/java/awt/CheckboxMenuItem.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CheckboxMenuItem__
-#define __java_awt_CheckboxMenuItem__
-
-#pragma interface
-
-#include <java/awt/MenuItem.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class CheckboxMenuItem;
-      namespace event
-      {
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::CheckboxMenuItem : public ::java::awt::MenuItem
-{
-
-public:
-  CheckboxMenuItem();
-  CheckboxMenuItem(::java::lang::String *);
-  CheckboxMenuItem(::java::lang::String *, jboolean);
-  virtual jboolean getState();
-  virtual void setState(jboolean);
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual void addNotify();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processItemEvent(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public:
-  virtual ::java::lang::String * paramString();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_chkmenuitem_number;
-  static const jlong serialVersionUID = 6190621106981774043LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::MenuItem)))) state;
-  ::java::awt::event::ItemListener * item_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_CheckboxMenuItem__
diff --git a/libjava/java/awt/Choice$AccessibleAWTChoice.h b/libjava/java/awt/Choice$AccessibleAWTChoice.h
deleted file mode 100644
index 61b2d237732..00000000000
--- a/libjava/java/awt/Choice$AccessibleAWTChoice.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Choice$AccessibleAWTChoice__
-#define __java_awt_Choice$AccessibleAWTChoice__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Choice;
-        class Choice$AccessibleAWTChoice;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Choice$AccessibleAWTChoice : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  Choice$AccessibleAWTChoice(::java::awt::Choice *);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-private:
-  static const jlong serialVersionUID = 7175603582428509322LL;
-public: // actually package-private
-  ::java::awt::Choice * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Choice$AccessibleAWTChoice__
diff --git a/libjava/java/awt/Choice.h b/libjava/java/awt/Choice.h
deleted file mode 100644
index fc0261391a1..00000000000
--- a/libjava/java/awt/Choice.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Choice__
-#define __java_awt_Choice__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Choice;
-      namespace event
-      {
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Choice : public ::java::awt::Component
-{
-
-public:
-  Choice();
-  virtual jint getItemCount();
-  virtual jint countItems();
-  virtual ::java::lang::String * getItem(jint);
-  virtual void add(::java::lang::String *);
-  virtual void addItem(::java::lang::String *);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void remove(::java::lang::String *);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual ::java::lang::String * getSelectedItem();
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual jint getSelectedIndex();
-  virtual void select(jint);
-  virtual void select(::java::lang::String *);
-  virtual void addNotify();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void processItemEvent(::java::awt::event::ItemEvent *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_choice_number;
-  static const jlong serialVersionUID = -4075310674757313071LL;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::Component)))) pItems;
-private:
-  jint selectedIndex;
-  ::java::awt::event::ItemListener * item_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Choice__
diff --git a/libjava/java/awt/Color.h b/libjava/java/awt/Color.h
deleted file mode 100644
index a1bbaff49be..00000000000
--- a/libjava/java/awt/Color.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Color__
-#define __java_awt_Color__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class ColorPaintContext;
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::Color : public ::java::lang::Object
-{
-
-public:
-  Color(jint, jint, jint);
-  Color(jint, jint, jint, jint);
-  Color(jint);
-  Color(jint, jboolean);
-  Color(jfloat, jfloat, jfloat);
-  Color(jfloat, jfloat, jfloat, jfloat);
-  Color(::java::awt::color::ColorSpace *, JArray< jfloat > *, jfloat);
-  virtual jint getRed();
-  virtual jint getGreen();
-  virtual jint getBlue();
-  virtual jint getAlpha();
-  virtual jint getRGB();
-  virtual ::java::awt::Color * brighter();
-  virtual ::java::awt::Color * darker();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  static ::java::awt::Color * decode(::java::lang::String *);
-  static ::java::awt::Color * getColor(::java::lang::String *);
-  static ::java::awt::Color * getColor(::java::lang::String *, ::java::awt::Color *);
-  static ::java::awt::Color * getColor(::java::lang::String *, jint);
-  static jint HSBtoRGB(jfloat, jfloat, jfloat);
-  static JArray< jfloat > * RGBtoHSB(jint, jint, jint, JArray< jfloat > *);
-  static ::java::awt::Color * getHSBColor(jfloat, jfloat, jfloat);
-  virtual JArray< jfloat > * getRGBComponents(JArray< jfloat > *);
-  virtual JArray< jfloat > * getRGBColorComponents(JArray< jfloat > *);
-  virtual JArray< jfloat > * getComponents(JArray< jfloat > *);
-  virtual JArray< jfloat > * getColorComponents(JArray< jfloat > *);
-  virtual JArray< jfloat > * getComponents(::java::awt::color::ColorSpace *, JArray< jfloat > *);
-  virtual JArray< jfloat > * getColorComponents(::java::awt::color::ColorSpace *, JArray< jfloat > *);
-  virtual ::java::awt::color::ColorSpace * getColorSpace();
-  virtual ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  virtual jint getTransparency();
-private:
-  static jint convert(jfloat, jfloat, jfloat, jfloat);
-  static const jlong serialVersionUID = 118526816881161077LL;
-public:
-  static ::java::awt::Color * white;
-  static ::java::awt::Color * WHITE;
-  static ::java::awt::Color * lightGray;
-  static ::java::awt::Color * LIGHT_GRAY;
-  static ::java::awt::Color * gray;
-  static ::java::awt::Color * GRAY;
-  static ::java::awt::Color * darkGray;
-  static ::java::awt::Color * DARK_GRAY;
-  static ::java::awt::Color * black;
-  static ::java::awt::Color * BLACK;
-  static ::java::awt::Color * red;
-  static ::java::awt::Color * RED;
-  static ::java::awt::Color * pink;
-  static ::java::awt::Color * PINK;
-  static ::java::awt::Color * orange;
-  static ::java::awt::Color * ORANGE;
-  static ::java::awt::Color * yellow;
-  static ::java::awt::Color * YELLOW;
-  static ::java::awt::Color * green;
-  static ::java::awt::Color * GREEN;
-  static ::java::awt::Color * magenta;
-  static ::java::awt::Color * MAGENTA;
-  static ::java::awt::Color * cyan;
-  static ::java::awt::Color * CYAN;
-  static ::java::awt::Color * blue;
-  static ::java::awt::Color * BLUE;
-private:
-  static const jint RED_MASK = 16711680;
-  static const jint GREEN_MASK = 65280;
-  static const jint BLUE_MASK = 255;
-public: // actually package-private
-  static const jint ALPHA_MASK = -16777216;
-private:
-  static jfloat BRIGHT_SCALE;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  JArray< jfloat > * frgbvalue;
-  JArray< jfloat > * fvalue;
-  jfloat falpha;
-  ::java::awt::color::ColorSpace * cs;
-public: // actually package-private
-  ::java::awt::ColorPaintContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Color__
diff --git a/libjava/java/awt/ColorPaintContext$ColorRaster.h b/libjava/java/awt/ColorPaintContext$ColorRaster.h
deleted file mode 100644
index d116f81c907..00000000000
--- a/libjava/java/awt/ColorPaintContext$ColorRaster.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ColorPaintContext$ColorRaster__
-#define __java_awt_ColorPaintContext$ColorRaster__
-
-#pragma interface
-
-#include <java/awt/image/Raster.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ColorPaintContext;
-        class ColorPaintContext$ColorRaster;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::ColorPaintContext$ColorRaster : public ::java::awt::image::Raster
-{
-
-public: // actually package-private
-  ColorPaintContext$ColorRaster(::java::awt::ColorPaintContext *, ::java::awt::image::ColorModel *, jint, jint, jint, jint, jint);
-private:
-  ::java::lang::Object * multiplyData(::java::lang::Object *, ::java::lang::Object *, jint);
-public: // actually package-private
-  ::java::awt::ColorPaintContext * __attribute__((aligned(__alignof__( ::java::awt::image::Raster)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ColorPaintContext$ColorRaster__
diff --git a/libjava/java/awt/ColorPaintContext.h b/libjava/java/awt/ColorPaintContext.h
deleted file mode 100644
index e96fc43ff80..00000000000
--- a/libjava/java/awt/ColorPaintContext.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ColorPaintContext__
-#define __java_awt_ColorPaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ColorPaintContext;
-        class ColorPaintContext$ColorRaster;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-      }
-    }
-  }
-}
-
-class java::awt::ColorPaintContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ColorPaintContext(jint);
-  ColorPaintContext(::java::awt::image::ColorModel *, jint);
-public:
-  virtual void dispose();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) color;
-  ::java::awt::image::ColorModel * colorModel;
-private:
-  ::java::awt::ColorPaintContext$ColorRaster * cachedRaster;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ColorPaintContext__
diff --git a/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.h b/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.h
deleted file mode 100644
index 4dda12238a4..00000000000
--- a/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$AccessibleAWTComponent$AccessibleAWTComponentHandler__
-#define __java_awt_Component$AccessibleAWTComponent$AccessibleAWTComponentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component$AccessibleAWTComponent;
-        class Component$AccessibleAWTComponent$AccessibleAWTComponentHandler;
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::Component$AccessibleAWTComponent$AccessibleAWTComponentHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  Component$AccessibleAWTComponent$AccessibleAWTComponentHandler(::java::awt::Component$AccessibleAWTComponent *);
-public:
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  ::java::awt::Component$AccessibleAWTComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$AccessibleAWTComponent$AccessibleAWTComponentHandler__
diff --git a/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.h b/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.h
deleted file mode 100644
index 429c49aa7eb..00000000000
--- a/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$AccessibleAWTComponent$AccessibleAWTFocusHandler__
-#define __java_awt_Component$AccessibleAWTComponent$AccessibleAWTFocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component$AccessibleAWTComponent;
-        class Component$AccessibleAWTComponent$AccessibleAWTFocusHandler;
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-}
-
-class java::awt::Component$AccessibleAWTComponent$AccessibleAWTFocusHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  Component$AccessibleAWTComponent$AccessibleAWTFocusHandler(::java::awt::Component$AccessibleAWTComponent *);
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::java::awt::Component$AccessibleAWTComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$AccessibleAWTComponent$AccessibleAWTFocusHandler__
diff --git a/libjava/java/awt/Component$AccessibleAWTComponent.h b/libjava/java/awt/Component$AccessibleAWTComponent.h
deleted file mode 100644
index c46ecf76c12..00000000000
--- a/libjava/java/awt/Component$AccessibleAWTComponent.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$AccessibleAWTComponent__
-#define __java_awt_Component$AccessibleAWTComponent__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Component$AccessibleAWTComponent;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class ComponentListener;
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleComponent;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::Component$AccessibleAWTComponent : public ::javax::accessibility::AccessibleContext
-{
-
-public: // actually protected
-  Component$AccessibleAWTComponent(::java::awt::Component *);
-public:
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::java::lang::String * getAccessibleDescription();
-  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 ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  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:
-  static const jlong serialVersionUID = 642321655757800191LL;
-public: // actually protected
-  ::java::awt::event::ComponentListener * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) accessibleAWTComponentHandler;
-  ::java::awt::event::FocusListener * accessibleAWTFocusHandler;
-public: // actually package-private
-  ::java::awt::Component * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$AccessibleAWTComponent__
diff --git a/libjava/java/awt/Component$BltBufferStrategy.h b/libjava/java/awt/Component$BltBufferStrategy.h
deleted file mode 100644
index ca93face167..00000000000
--- a/libjava/java/awt/Component$BltBufferStrategy.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$BltBufferStrategy__
-#define __java_awt_Component$BltBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/image/BufferStrategy.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class Component;
-        class Component$BltBufferStrategy;
-        class Graphics;
-      namespace image
-      {
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::Component$BltBufferStrategy : public ::java::awt::image::BufferStrategy
-{
-
-public: // actually protected
-  Component$BltBufferStrategy(::java::awt::Component *, jint, ::java::awt::BufferCapabilities *);
-  virtual void createBackBuffers(jint);
-public:
-  virtual ::java::awt::BufferCapabilities * getCapabilities();
-  virtual ::java::awt::Graphics * getDrawGraphics();
-  virtual void show();
-public: // actually protected
-  virtual void revalidate();
-public:
-  virtual jboolean contentsLost();
-  virtual jboolean contentsRestored();
-public: // actually protected
-  ::java::awt::BufferCapabilities * __attribute__((aligned(__alignof__( ::java::awt::image::BufferStrategy)))) caps;
-  JArray< ::java::awt::image::VolatileImage * > * backBuffers;
-  jboolean validatedContents;
-  jint width;
-  jint height;
-private:
-  ::java::awt::image::VolatileImage * frontBuffer;
-public: // actually package-private
-  ::java::awt::Component * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$BltBufferStrategy__
diff --git a/libjava/java/awt/Component$FlipBufferStrategy.h b/libjava/java/awt/Component$FlipBufferStrategy.h
deleted file mode 100644
index 654cfd29a3a..00000000000
--- a/libjava/java/awt/Component$FlipBufferStrategy.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$FlipBufferStrategy__
-#define __java_awt_Component$FlipBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/image/BufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Component;
-        class Component$FlipBufferStrategy;
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::Component$FlipBufferStrategy : public ::java::awt::image::BufferStrategy
-{
-
-public: // actually protected
-  Component$FlipBufferStrategy(::java::awt::Component *, jint, ::java::awt::BufferCapabilities *);
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-public:
-  virtual ::java::awt::BufferCapabilities * getCapabilities();
-  virtual ::java::awt::Graphics * getDrawGraphics();
-public: // actually protected
-  virtual void revalidate();
-public:
-  virtual jboolean contentsLost();
-  virtual jboolean contentsRestored();
-  virtual void show();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::BufferStrategy)))) numBuffers;
-  ::java::awt::BufferCapabilities * caps;
-  ::java::awt::Image * drawBuffer;
-  ::java::awt::image::VolatileImage * drawVBuffer;
-  jboolean validatedContents;
-private:
-  jint width;
-  jint height;
-public: // actually package-private
-  ::java::awt::Component * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$FlipBufferStrategy__
diff --git a/libjava/java/awt/Component$HeavyweightInLightweightListener.h b/libjava/java/awt/Component$HeavyweightInLightweightListener.h
deleted file mode 100644
index 571b22dfa03..00000000000
--- a/libjava/java/awt/Component$HeavyweightInLightweightListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$HeavyweightInLightweightListener__
-#define __java_awt_Component$HeavyweightInLightweightListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Component$HeavyweightInLightweightListener;
-        class Container;
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::Component$HeavyweightInLightweightListener : public ::java::lang::Object
-{
-
-public:
-  Component$HeavyweightInLightweightListener(::java::awt::Component *, ::java::awt::Container *);
-  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
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$HeavyweightInLightweightListener__
diff --git a/libjava/java/awt/Component.h b/libjava/java/awt/Component.h
deleted file mode 100644
index 23edfa77e98..00000000000
--- a/libjava/java/awt/Component.h
+++ /dev/null
@@ -1,438 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component__
-#define __java_awt_Component__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Color;
-        class Component;
-        class ComponentOrientation;
-        class Container;
-        class Cursor;
-        class Dimension;
-        class Event;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class ImageCapabilities;
-        class MenuComponent;
-        class Point;
-        class PopupMenu;
-        class Rectangle;
-        class Toolkit;
-      namespace dnd
-      {
-          class DropTarget;
-      }
-      namespace event
-      {
-          class ComponentEvent;
-          class ComponentListener;
-          class FocusEvent;
-          class FocusListener;
-          class HierarchyBoundsListener;
-          class HierarchyEvent;
-          class HierarchyListener;
-          class InputMethodEvent;
-          class InputMethodListener;
-          class KeyEvent;
-          class KeyListener;
-          class MouseEvent;
-          class MouseListener;
-          class MouseMotionListener;
-          class MouseWheelEvent;
-          class MouseWheelListener;
-      }
-      namespace im
-      {
-          class InputContext;
-          class InputMethodRequests;
-      }
-      namespace image
-      {
-          class BufferStrategy;
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ComponentPeer;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Component : public ::java::lang::Object
-{
-
-public: // actually protected
-  Component();
-public:
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::awt::Container * getParent();
-  virtual ::java::awt::peer::ComponentPeer * getPeer();
-  virtual void setDropTarget(::java::awt::dnd::DropTarget *);
-  virtual ::java::awt::dnd::DropTarget * getDropTarget();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual ::java::lang::Object * getTreeLock();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual jboolean isValid();
-  virtual jboolean isDisplayable();
-  virtual jboolean isVisible();
-  virtual jboolean isShowing();
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual void enable();
-  virtual void enable(jboolean);
-  virtual void disable();
-  virtual jboolean isDoubleBuffered();
-  virtual void enableInputMethods(jboolean);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual void show(jboolean);
-  virtual void hide();
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual jboolean isForegroundSet();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual jboolean isBackgroundSet();
-  virtual ::java::awt::Font * getFont();
-private:
-  ::java::awt::Font * getFontImpl();
-public:
-  virtual void setFont(::java::awt::Font *);
-  virtual jboolean isFontSet();
-  virtual ::java::util::Locale * getLocale();
-  virtual void setLocale(::java::util::Locale *);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::Point * getLocation();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * location();
-  virtual void setLocation(jint, jint);
-  virtual void move(jint, jint);
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual ::java::awt::Dimension * size();
-  virtual void setSize(jint, jint);
-  virtual void resize(jint, jint);
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void resize(::java::awt::Dimension *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Rectangle * bounds();
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void reshape(jint, jint, jint, jint);
-public: // actually package-private
-  virtual void notifyReshape(jboolean, jboolean);
-public:
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual jint getX();
-  virtual jint getY();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual ::java::awt::Rectangle * getBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize(::java::awt::Dimension *);
-  virtual ::java::awt::Point * getLocation(::java::awt::Point *);
-  virtual jboolean isOpaque();
-  virtual jboolean isLightweight();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setPreferredSize(::java::awt::Dimension *);
-  virtual jboolean isPreferredSizeSet();
-  virtual ::java::awt::Dimension * preferredSize();
-public: // actually package-private
-  virtual ::java::awt::Dimension * preferredSizeImpl();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual void setMinimumSize(::java::awt::Dimension *);
-  virtual jboolean isMinimumSizeSet();
-  virtual ::java::awt::Dimension * minimumSize();
-public: // actually package-private
-  virtual ::java::awt::Dimension * minimumSizeImpl();
-public:
-  virtual ::java::awt::Dimension * getMaximumSize();
-public: // actually package-private
-  virtual ::java::awt::Dimension * maximumSizeImpl();
-public:
-  virtual void setMaximumSize(::java::awt::Dimension *);
-  virtual jboolean isMaximumSizeSet();
-  virtual jfloat getAlignmentX();
-  virtual jfloat getAlignmentY();
-  virtual void doLayout();
-  virtual void layout();
-  virtual void validate();
-  virtual void invalidate();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual jboolean isCursorSet();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void update(::java::awt::Graphics *);
-  virtual void paintAll(::java::awt::Graphics *);
-  virtual void repaint();
-  virtual void repaint(jlong);
-  virtual void repaint(jint, jint, jint, jint);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void print(::java::awt::Graphics *);
-  virtual void printAll(::java::awt::Graphics *);
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  virtual jboolean prepareImage(::java::awt::Image *, ::java::awt::image::ImageObserver *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jint checkImage(::java::awt::Image *, ::java::awt::image::ImageObserver *);
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void setIgnoreRepaint(jboolean);
-  virtual jboolean getIgnoreRepaint();
-  virtual jboolean contains(jint, jint);
-  virtual jboolean inside(jint, jint);
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Component * getComponentAt(jint, jint);
-  virtual ::java::awt::Component * locate(jint, jint);
-  virtual ::java::awt::Component * getComponentAt(::java::awt::Point *);
-  virtual void deliverEvent(::java::awt::Event *);
-  virtual void dispatchEvent(::java::awt::AWTEvent *);
-public: // actually package-private
-  static jboolean ignoreOldMouseEvents();
-public:
-  virtual jboolean postEvent(::java::awt::Event *);
-  virtual void addComponentListener(::java::awt::event::ComponentListener *);
-  virtual void removeComponentListener(::java::awt::event::ComponentListener *);
-  virtual JArray< ::java::awt::event::ComponentListener * > * getComponentListeners();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual JArray< ::java::awt::event::FocusListener * > * getFocusListeners();
-  virtual void addHierarchyListener(::java::awt::event::HierarchyListener *);
-  virtual void removeHierarchyListener(::java::awt::event::HierarchyListener *);
-  virtual JArray< ::java::awt::event::HierarchyListener * > * getHierarchyListeners();
-  virtual void addHierarchyBoundsListener(::java::awt::event::HierarchyBoundsListener *);
-  virtual void removeHierarchyBoundsListener(::java::awt::event::HierarchyBoundsListener *);
-  virtual JArray< ::java::awt::event::HierarchyBoundsListener * > * getHierarchyBoundsListeners();
-public: // actually package-private
-  virtual void fireHierarchyEvent(jint, ::java::awt::Component *, ::java::awt::Container *, jlong);
-public:
-  virtual void addKeyListener(::java::awt::event::KeyListener *);
-  virtual void removeKeyListener(::java::awt::event::KeyListener *);
-  virtual JArray< ::java::awt::event::KeyListener * > * getKeyListeners();
-  virtual void addMouseListener(::java::awt::event::MouseListener *);
-  virtual void removeMouseListener(::java::awt::event::MouseListener *);
-  virtual JArray< ::java::awt::event::MouseListener * > * getMouseListeners();
-  virtual void addMouseMotionListener(::java::awt::event::MouseMotionListener *);
-  virtual void removeMouseMotionListener(::java::awt::event::MouseMotionListener *);
-  virtual JArray< ::java::awt::event::MouseMotionListener * > * getMouseMotionListeners();
-  virtual void addMouseWheelListener(::java::awt::event::MouseWheelListener *);
-  virtual void removeMouseWheelListener(::java::awt::event::MouseWheelListener *);
-  virtual JArray< ::java::awt::event::MouseWheelListener * > * getMouseWheelListeners();
-  virtual void addInputMethodListener(::java::awt::event::InputMethodListener *);
-  virtual void removeInputMethodListener(::java::awt::event::InputMethodListener *);
-  virtual JArray< ::java::awt::event::InputMethodListener * > * getInputMethodListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  virtual ::java::awt::im::InputContext * getInputContext();
-public: // actually protected
-  virtual void enableEvents(jlong);
-  virtual void disableEvents(jlong);
-  virtual ::java::awt::AWTEvent * coalesceEvents(::java::awt::AWTEvent *, ::java::awt::AWTEvent *);
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processComponentEvent(::java::awt::event::ComponentEvent *);
-  virtual void processFocusEvent(::java::awt::event::FocusEvent *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void processMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void processMouseWheelEvent(::java::awt::event::MouseWheelEvent *);
-  virtual void processInputMethodEvent(::java::awt::event::InputMethodEvent *);
-  virtual void processHierarchyEvent(::java::awt::event::HierarchyEvent *);
-  virtual void processHierarchyBoundsEvent(::java::awt::event::HierarchyEvent *);
-public:
-  virtual jboolean handleEvent(::java::awt::Event *);
-  virtual jboolean mouseDown(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseDrag(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseUp(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseMove(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseEnter(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseExit(::java::awt::Event *, jint, jint);
-  virtual jboolean keyDown(::java::awt::Event *, jint);
-  virtual jboolean keyUp(::java::awt::Event *, jint);
-  virtual jboolean action(::java::awt::Event *, ::java::lang::Object *);
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual jboolean gotFocus(::java::awt::Event *, ::java::lang::Object *);
-  virtual jboolean lostFocus(::java::awt::Event *, ::java::lang::Object *);
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isFocusable();
-  virtual void setFocusable(jboolean);
-  virtual void setFocusTraversalKeys(jint, ::java::util::Set *);
-  virtual ::java::util::Set * getFocusTraversalKeys(jint);
-  virtual jboolean areFocusTraversalKeysSet(jint);
-  virtual void setFocusTraversalKeysEnabled(jboolean);
-  virtual jboolean getFocusTraversalKeysEnabled();
-  virtual void requestFocus();
-public: // actually protected
-  virtual jboolean requestFocus(jboolean);
-public:
-  virtual jboolean requestFocusInWindow();
-public: // actually protected
-  virtual jboolean requestFocusInWindow(jboolean);
-private:
-  jboolean requestFocusImpl(jboolean, jboolean);
-public:
-  virtual void transferFocus();
-  virtual ::java::awt::Container * getFocusCycleRootAncestor();
-  virtual jboolean isFocusCycleRoot(::java::awt::Container *);
-  virtual void nextFocus();
-  virtual void transferFocusBackward();
-  virtual void transferFocusUpCycle();
-  virtual jboolean hasFocus();
-  virtual jboolean isFocusOwner();
-  virtual void add(::java::awt::PopupMenu *);
-  virtual void remove(::java::awt::MenuComponent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::java::lang::String * toString();
-  virtual void list();
-  virtual void list(::java::io::PrintStream *);
-  virtual void list(::java::io::PrintStream *, jint);
-  virtual void list(::java::io::PrintWriter *);
-  virtual void list(::java::io::PrintWriter *, jint);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-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 *, jlong, jlong);
-  virtual void firePropertyChange(::java::lang::String *, jfloat, jfloat);
-  virtual void firePropertyChange(::java::lang::String *, jdouble, jdouble);
-  virtual void setComponentOrientation(::java::awt::ComponentOrientation *);
-  virtual ::java::awt::ComponentOrientation * getComponentOrientation();
-  virtual void applyComponentOrientation(::java::awt::ComponentOrientation *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-  virtual void setPeer(::java::awt::peer::ComponentPeer *);
-  static ::java::awt::Event * translateEvent(::java::awt::AWTEvent *);
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-  virtual jboolean eventTypeEnabled(jint);
-  virtual jboolean isHierarchyVisible();
-public:
-  virtual ::java::awt::Point * getMousePosition();
-public: // actually package-private
-  virtual ::java::awt::Point * getMousePositionHelper(jboolean);
-  virtual jboolean mouseOverComponent(::java::awt::Component *, jboolean);
-  virtual ::java::awt::Component * findNextFocusComponent(::java::awt::Component *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -7644114512714619750LL;
-public:
-  static jfloat TOP_ALIGNMENT;
-  static jfloat CENTER_ALIGNMENT;
-  static jfloat BOTTOM_ALIGNMENT;
-  static jfloat RIGHT_ALIGNMENT;
-  static jfloat LEFT_ALIGNMENT;
-public: // actually package-private
-  static ::java::lang::Object * treeLock;
-private:
-  static ::java::awt::Dimension * DEFAULT_MAX_SIZE;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint width;
-  jint height;
-  ::java::awt::Color * foreground;
-  ::java::awt::Color * background;
-  ::java::awt::Font * font;
-  ::java::awt::Font * peerFont;
-  ::java::awt::Cursor * cursor;
-  ::java::util::Locale * locale;
-  jboolean ignoreRepaint;
-  jboolean visible;
-  jboolean enabled;
-  jboolean valid;
-  ::java::awt::dnd::DropTarget * dropTarget;
-  ::java::util::Vector * popups;
-  ::java::lang::String * name;
-  jboolean nameExplicitlySet;
-  jboolean focusable;
-  jint isFocusTraversableOverridden;
-  JArray< ::java::util::Set * > * focusTraversalKeys;
-  jboolean focusTraversalKeysEnabled;
-  ::java::awt::Dimension * minSize;
-  jboolean minSizeSet;
-  ::java::awt::Dimension * maxSize;
-  jboolean maxSizeSet;
-  ::java::awt::Dimension * prefSize;
-  jboolean prefSizeSet;
-  jboolean newEventsOnly;
-  jlong eventMask;
-  ::java::beans::PropertyChangeSupport * changeSupport;
-  jboolean isPacked;
-  jint componentSerializedDataVersion;
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-  ::java::awt::event::ComponentListener * componentListener;
-  ::java::awt::event::FocusListener * focusListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::java::awt::event::MouseListener * mouseListener;
-  ::java::awt::event::MouseMotionListener * mouseMotionListener;
-  ::java::awt::event::MouseWheelListener * mouseWheelListener;
-  ::java::awt::event::InputMethodListener * inputMethodListener;
-  ::java::awt::event::HierarchyListener * hierarchyListener;
-  ::java::awt::event::HierarchyBoundsListener * hierarchyBoundsListener;
-  ::java::awt::Container * parent;
-  ::java::awt::peer::ComponentPeer * peer;
-  ::java::awt::ComponentOrientation * componentOrientation;
-  ::java::awt::GraphicsConfiguration * graphicsConfig;
-  ::java::awt::image::BufferStrategy * bufferStrategy;
-  jint numHierarchyListeners;
-  jint numHierarchyBoundsListeners;
-private:
-  ::java::awt::event::FocusEvent * pendingFocusRequest;
-  static jboolean incrementalDraw;
-  static ::java::lang::Long * redrawRate;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component__
diff --git a/libjava/java/awt/ComponentOrientation.h b/libjava/java/awt/ComponentOrientation.h
deleted file mode 100644
index fe3ef9c1740..00000000000
--- a/libjava/java/awt/ComponentOrientation.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ComponentOrientation__
-#define __java_awt_ComponentOrientation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ComponentOrientation;
-    }
-  }
-}
-
-class java::awt::ComponentOrientation : public ::java::lang::Object
-{
-
-  ComponentOrientation(jint);
-public:
-  jboolean isHorizontal();
-  jboolean isLeftToRight();
-  static ::java::awt::ComponentOrientation * getOrientation(::java::util::Locale *);
-  static ::java::awt::ComponentOrientation * getOrientation(::java::util::ResourceBundle *);
-private:
-  static const jlong serialVersionUID = -4113291392143563828LL;
-  static const jint UNKNOWN_ID = 1;
-  static const jint HORIZONTAL_ID = 2;
-  static const jint LEFT_TO_RIGHT_ID = 4;
-public:
-  static ::java::awt::ComponentOrientation * LEFT_TO_RIGHT;
-  static ::java::awt::ComponentOrientation * RIGHT_TO_LEFT;
-  static ::java::awt::ComponentOrientation * UNKNOWN;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) orientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ComponentOrientation__
diff --git a/libjava/java/awt/Composite.h b/libjava/java/awt/Composite.h
deleted file mode 100644
index 1eed4bcae1a..00000000000
--- a/libjava/java/awt/Composite.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Composite__
-#define __java_awt_Composite__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Composite;
-        class CompositeContext;
-        class RenderingHints;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::Composite : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::CompositeContext * createContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Composite__
diff --git a/libjava/java/awt/CompositeContext.h b/libjava/java/awt/CompositeContext.h
deleted file mode 100644
index 83195ab8bbf..00000000000
--- a/libjava/java/awt/CompositeContext.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CompositeContext__
-#define __java_awt_CompositeContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class CompositeContext;
-      namespace image
-      {
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::CompositeContext : public ::java::lang::Object
-{
-
-public:
-  virtual void dispose() = 0;
-  virtual void compose(::java::awt::image::Raster *, ::java::awt::image::Raster *, ::java::awt::image::WritableRaster *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_CompositeContext__
diff --git a/libjava/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.h b/libjava/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.h
deleted file mode 100644
index ae8aa684f14..00000000000
--- a/libjava/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$AccessibleAWTContainer$AccessibleContainerHandler__
-#define __java_awt_Container$AccessibleAWTContainer$AccessibleContainerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container$AccessibleAWTContainer;
-        class Container$AccessibleAWTContainer$AccessibleContainerHandler;
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-}
-
-class java::awt::Container$AccessibleAWTContainer$AccessibleContainerHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  Container$AccessibleAWTContainer$AccessibleContainerHandler(::java::awt::Container$AccessibleAWTContainer *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  ::java::awt::Container$AccessibleAWTContainer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$AccessibleAWTContainer$AccessibleContainerHandler__
diff --git a/libjava/java/awt/Container$AccessibleAWTContainer.h b/libjava/java/awt/Container$AccessibleAWTContainer.h
deleted file mode 100644
index fe132635d0d..00000000000
--- a/libjava/java/awt/Container$AccessibleAWTContainer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$AccessibleAWTContainer__
-#define __java_awt_Container$AccessibleAWTContainer__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Container$AccessibleAWTContainer;
-        class Point;
-      namespace event
-      {
-          class ContainerListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-  }
-}
-
-class java::awt::Container$AccessibleAWTContainer : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Container$AccessibleAWTContainer(::java::awt::Container *);
-public:
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-private:
-  static const jlong serialVersionUID = 5081320404842566097LL;
-public: // actually protected
-  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) accessibleContainerHandler;
-public: // actually package-private
-  ::java::awt::Container * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$AccessibleAWTContainer__
diff --git a/libjava/java/awt/Container$GfxPaintAllVisitor.h b/libjava/java/awt/Container$GfxPaintAllVisitor.h
deleted file mode 100644
index cd3e68e896f..00000000000
--- a/libjava/java/awt/Container$GfxPaintAllVisitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxPaintAllVisitor__
-#define __java_awt_Container$GfxPaintAllVisitor__
-
-#pragma interface
-
-#include <java/awt/Container$GfxVisitor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxPaintAllVisitor;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxPaintAllVisitor : public ::java::awt::Container$GfxVisitor
-{
-
-public: // actually package-private
-  Container$GfxPaintAllVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *);
-  static ::java::awt::Container$GfxVisitor * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxPaintAllVisitor__
diff --git a/libjava/java/awt/Container$GfxPaintVisitor.h b/libjava/java/awt/Container$GfxPaintVisitor.h
deleted file mode 100644
index c75ddd1a349..00000000000
--- a/libjava/java/awt/Container$GfxPaintVisitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxPaintVisitor__
-#define __java_awt_Container$GfxPaintVisitor__
-
-#pragma interface
-
-#include <java/awt/Container$GfxVisitor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxPaintVisitor;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxPaintVisitor : public ::java::awt::Container$GfxVisitor
-{
-
-public: // actually package-private
-  Container$GfxPaintVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *);
-  static ::java::awt::Container$GfxVisitor * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxPaintVisitor__
diff --git a/libjava/java/awt/Container$GfxPrintAllVisitor.h b/libjava/java/awt/Container$GfxPrintAllVisitor.h
deleted file mode 100644
index acc4a8ba491..00000000000
--- a/libjava/java/awt/Container$GfxPrintAllVisitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxPrintAllVisitor__
-#define __java_awt_Container$GfxPrintAllVisitor__
-
-#pragma interface
-
-#include <java/awt/Container$GfxVisitor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxPrintAllVisitor;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxPrintAllVisitor : public ::java::awt::Container$GfxVisitor
-{
-
-public: // actually package-private
-  Container$GfxPrintAllVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *);
-  static ::java::awt::Container$GfxVisitor * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxPrintAllVisitor__
diff --git a/libjava/java/awt/Container$GfxPrintVisitor.h b/libjava/java/awt/Container$GfxPrintVisitor.h
deleted file mode 100644
index 557530ba851..00000000000
--- a/libjava/java/awt/Container$GfxPrintVisitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxPrintVisitor__
-#define __java_awt_Container$GfxPrintVisitor__
-
-#pragma interface
-
-#include <java/awt/Container$GfxVisitor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxPrintVisitor;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxPrintVisitor : public ::java::awt::Container$GfxVisitor
-{
-
-public: // actually package-private
-  Container$GfxPrintVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *);
-  static ::java::awt::Container$GfxVisitor * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxPrintVisitor__
diff --git a/libjava/java/awt/Container$GfxVisitor.h b/libjava/java/awt/Container$GfxVisitor.h
deleted file mode 100644
index 97322e8d5da..00000000000
--- a/libjava/java/awt/Container$GfxVisitor.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxVisitor__
-#define __java_awt_Container$GfxVisitor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxVisitor : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Container$GfxVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxVisitor__
diff --git a/libjava/java/awt/Container.h b/libjava/java/awt/Container.h
deleted file mode 100644
index 3ea162aaede..00000000000
--- a/libjava/java/awt/Container.h
+++ /dev/null
@@ -1,168 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container__
-#define __java_awt_Container__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-        class ComponentOrientation;
-        class Container;
-        class Container$GfxVisitor;
-        class Dimension;
-        class Event;
-        class FocusTraversalPolicy;
-        class Font;
-        class Graphics;
-        class Insets;
-        class LayoutManager;
-        class Point;
-      namespace event
-      {
-          class ContainerEvent;
-          class ContainerListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-}
-
-class java::awt::Container : public ::java::awt::Component
-{
-
-public:
-  Container();
-  virtual jint getComponentCount();
-  virtual jint countComponents();
-  virtual ::java::awt::Component * getComponent(jint);
-  virtual JArray< ::java::awt::Component * > * getComponents();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * insets();
-  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);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void remove(jint);
-  virtual void remove(::java::awt::Component *);
-  virtual void removeAll();
-  virtual ::java::awt::LayoutManager * getLayout();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void doLayout();
-  virtual void layout();
-  virtual void invalidate();
-  virtual void validate();
-private:
-  void invalidateTree();
-public: // actually protected
-  virtual void validateTree();
-public:
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual jfloat getAlignmentX();
-  virtual jfloat getAlignmentY();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void update(::java::awt::Graphics *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void paintComponents(::java::awt::Graphics *);
-  virtual void printComponents(::java::awt::Graphics *);
-  virtual void addContainerListener(::java::awt::event::ContainerListener *);
-  virtual void removeContainerListener(::java::awt::event::ContainerListener *);
-  virtual JArray< ::java::awt::event::ContainerListener * > * getContainerListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processContainerEvent(::java::awt::event::ContainerEvent *);
-public:
-  virtual void deliverEvent(::java::awt::Event *);
-  virtual ::java::awt::Component * getComponentAt(jint, jint);
-  virtual ::java::awt::Point * getMousePosition(jboolean);
-public: // actually package-private
-  virtual jboolean mouseOverComponent(::java::awt::Component *, jboolean);
-public:
-  virtual ::java::awt::Component * locate(jint, jint);
-  virtual ::java::awt::Component * getComponentAt(::java::awt::Point *);
-  virtual ::java::awt::Component * findComponentAt(jint, jint);
-  virtual ::java::awt::Component * findComponentAt(::java::awt::Point *);
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual jboolean isAncestorOf(::java::awt::Component *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void list(::java::io::PrintStream *, jint);
-  virtual void list(::java::io::PrintWriter *, jint);
-  virtual void setFocusTraversalKeys(jint, ::java::util::Set *);
-  virtual ::java::util::Set * getFocusTraversalKeys(jint);
-  virtual jboolean areFocusTraversalKeysSet(jint);
-  virtual jboolean isFocusCycleRoot(::java::awt::Container *);
-  virtual void setFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
-  virtual ::java::awt::FocusTraversalPolicy * getFocusTraversalPolicy();
-  virtual jboolean isFocusTraversalPolicySet();
-  virtual void setFocusCycleRoot(jboolean);
-  virtual jboolean isFocusTraversalPolicyProvider();
-  virtual void setFocusTraversalPolicyProvider(jboolean);
-  virtual jboolean isFocusCycleRoot();
-  virtual void transferFocusDownCycle();
-  virtual void applyComponentOrientation(::java::awt::ComponentOrientation *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void setComponentZOrder(::java::awt::Component *, jint);
-  virtual jint getComponentZOrder(::java::awt::Component *);
-private:
-  void visitChildren(::java::awt::Graphics *, ::java::awt::Container$GfxVisitor *, jboolean);
-  void visitChild(::java::awt::Graphics *, ::java::awt::Container$GfxVisitor *, ::java::awt::Component *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-  virtual void dispatchNoLightweight(::java::awt::AWTEvent *);
-  virtual jboolean eventTypeEnabled(jint);
-  virtual ::java::awt::Component * findNextFocusComponent(::java::awt::Component *);
-  virtual void fireHierarchyEvent(jint, ::java::awt::Component *, ::java::awt::Container *, jlong);
-  virtual void updateHierarchyListenerCount(jlong, jint);
-  virtual void notifyReshape(jboolean, jboolean);
-private:
-  void addNotifyContainerChildren();
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 4613797578919906343LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::Component)))) ncomponents;
-  JArray< ::java::awt::Component * > * component;
-  ::java::awt::LayoutManager * layoutMgr;
-  jboolean focusCycleRoot;
-private:
-  jboolean focusTraversalPolicyProvider;
-public: // actually package-private
-  jint containerSerializedDataVersion;
-  ::java::awt::event::ContainerListener * containerListener;
-private:
-  ::java::awt::FocusTraversalPolicy * focusTraversalPolicy;
-public: // actually package-private
-  JArray< ::java::util::Set * > * focusTraversalKeys;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container__
diff --git a/libjava/java/awt/ContainerOrderFocusTraversalPolicy.h b/libjava/java/awt/ContainerOrderFocusTraversalPolicy.h
deleted file mode 100644
index 8f0e89f9b3f..00000000000
--- a/libjava/java/awt/ContainerOrderFocusTraversalPolicy.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ContainerOrderFocusTraversalPolicy__
-#define __java_awt_ContainerOrderFocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/awt/FocusTraversalPolicy.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class ContainerOrderFocusTraversalPolicy;
-    }
-  }
-}
-
-class java::awt::ContainerOrderFocusTraversalPolicy : public ::java::awt::FocusTraversalPolicy
-{
-
-public:
-  ContainerOrderFocusTraversalPolicy();
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
-private:
-  ::java::awt::Component * getNextAvailableComponent(JArray< ::java::awt::Component * > *, jint, jint);
-public: // actually package-private
-  virtual ::java::awt::Component * getPrevAvailableComponent(JArray< ::java::awt::Component * > *, jint, jint);
-public:
-  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 *);
-  virtual void setImplicitDownCycleTraversal(jboolean);
-  virtual jboolean getImplicitDownCycleTraversal();
-public: // actually protected
-  virtual jboolean accept(::java::awt::Component *);
-public: // actually package-private
-  static const jlong serialVersionUID = 486933713763926351LL;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::FocusTraversalPolicy)))) implicitDownCycleTraversal;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ContainerOrderFocusTraversalPolicy__
diff --git a/libjava/java/awt/Cursor.h b/libjava/java/awt/Cursor.h
deleted file mode 100644
index 3d50e634537..00000000000
--- a/libjava/java/awt/Cursor.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Cursor__
-#define __java_awt_Cursor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Cursor;
-    }
-  }
-}
-
-class java::awt::Cursor : public ::java::lang::Object
-{
-
-public:
-  Cursor(jint);
-public: // actually protected
-  Cursor(::java::lang::String *);
-public:
-  static ::java::awt::Cursor * getPredefinedCursor(jint);
-  static ::java::awt::Cursor * getSystemCustomCursor(::java::lang::String *);
-  static ::java::awt::Cursor * getDefaultCursor();
-  virtual jint getType();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 8028237497568985504LL;
-public:
-  static const jint DEFAULT_CURSOR = 0;
-  static const jint CROSSHAIR_CURSOR = 1;
-  static const jint TEXT_CURSOR = 2;
-  static const jint WAIT_CURSOR = 3;
-  static const jint SW_RESIZE_CURSOR = 4;
-  static const jint SE_RESIZE_CURSOR = 5;
-  static const jint NW_RESIZE_CURSOR = 6;
-  static const jint NE_RESIZE_CURSOR = 7;
-  static const jint N_RESIZE_CURSOR = 8;
-  static const jint S_RESIZE_CURSOR = 9;
-  static const jint W_RESIZE_CURSOR = 10;
-  static const jint E_RESIZE_CURSOR = 11;
-  static const jint HAND_CURSOR = 12;
-  static const jint MOVE_CURSOR = 13;
-private:
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static const jint CUSTOM_CURSOR = -1;
-private:
-  static const jint PREDEFINED_COUNT = 14;
-public: // actually protected
-  static JArray< ::java::awt::Cursor * > * predefined;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public: // actually package-private
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Cursor__
diff --git a/libjava/java/awt/DefaultFocusTraversalPolicy.h b/libjava/java/awt/DefaultFocusTraversalPolicy.h
deleted file mode 100644
index d6f22987dca..00000000000
--- a/libjava/java/awt/DefaultFocusTraversalPolicy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_DefaultFocusTraversalPolicy__
-#define __java_awt_DefaultFocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/awt/ContainerOrderFocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class DefaultFocusTraversalPolicy;
-    }
-  }
-}
-
-class java::awt::DefaultFocusTraversalPolicy : public ::java::awt::ContainerOrderFocusTraversalPolicy
-{
-
-public:
-  DefaultFocusTraversalPolicy();
-public: // actually protected
-  virtual jboolean accept(::java::awt::Component *);
-private:
-  static const jlong serialVersionUID = 8876966522510157497LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_DefaultFocusTraversalPolicy__
diff --git a/libjava/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.h b/libjava/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.h
deleted file mode 100644
index 7061d499ec2..00000000000
--- a/libjava/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_DefaultKeyboardFocusManager$EventDelayRequest__
-#define __java_awt_DefaultKeyboardFocusManager$EventDelayRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class DefaultKeyboardFocusManager;
-        class DefaultKeyboardFocusManager$EventDelayRequest;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::DefaultKeyboardFocusManager$EventDelayRequest : public ::java::lang::Object
-{
-
-public:
-  DefaultKeyboardFocusManager$EventDelayRequest(::java::awt::DefaultKeyboardFocusManager *, jlong, ::java::awt::Component *);
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual void enqueueEvent(::java::awt::event::KeyEvent *);
-  virtual void dispatchEvents();
-  virtual void discardEvents();
-private:
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enqueuedKeyEvents;
-public:
-  jlong timestamp;
-  ::java::awt::Component * focusedComp;
-public: // actually package-private
-  ::java::awt::DefaultKeyboardFocusManager * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_DefaultKeyboardFocusManager$EventDelayRequest__
diff --git a/libjava/java/awt/DefaultKeyboardFocusManager.h b/libjava/java/awt/DefaultKeyboardFocusManager.h
deleted file mode 100644
index ce9e4467ca5..00000000000
--- a/libjava/java/awt/DefaultKeyboardFocusManager.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_DefaultKeyboardFocusManager__
-#define __java_awt_DefaultKeyboardFocusManager__
-
-#pragma interface
-
-#include <java/awt/KeyboardFocusManager.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class AWTKeyStroke;
-        class Component;
-        class Container;
-        class DefaultKeyboardFocusManager;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::DefaultKeyboardFocusManager : public ::java::awt::KeyboardFocusManager
-{
-
-public:
-  DefaultKeyboardFocusManager();
-  virtual jboolean dispatchEvent(::java::awt::AWTEvent *);
-private:
-  jboolean handleFocusGained(::java::awt::event::FocusEvent *);
-  jboolean handleFocusLost(::java::awt::event::FocusEvent *);
-  jboolean enqueueKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *);
-  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *);
-public: // actually protected
-  virtual void enqueueKeyEvents(jlong, ::java::awt::Component *);
-  virtual void dequeueKeyEvents(jlong, ::java::awt::Component *);
-  virtual void discardKeyEvents(::java::awt::Component *);
-public:
-  virtual void focusPreviousComponent(::java::awt::Component *);
-  virtual void focusNextComponent(::java::awt::Component *);
-  virtual void upFocusCycle(::java::awt::Component *);
-  virtual void downFocusCycle(::java::awt::Container *);
-private:
-  ::java::awt::AWTKeyStroke * __attribute__((aligned(__alignof__( ::java::awt::KeyboardFocusManager)))) waitForKeyStroke;
-  ::java::util::SortedSet * delayRequests;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_DefaultKeyboardFocusManager__
diff --git a/libjava/java/awt/Desktop$Action.h b/libjava/java/awt/Desktop$Action.h
deleted file mode 100644
index f862b4dc0f9..00000000000
--- a/libjava/java/awt/Desktop$Action.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Desktop$Action__
-#define __java_awt_Desktop$Action__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Desktop$Action;
-    }
-  }
-}
-
-class java::awt::Desktop$Action : public ::java::lang::Enum
-{
-
-  Desktop$Action(::java::lang::String *, jint);
-public:
-  static JArray< ::java::awt::Desktop$Action * > * values();
-  static ::java::awt::Desktop$Action * valueOf(::java::lang::String *);
-  static ::java::awt::Desktop$Action * BROWSE;
-  static ::java::awt::Desktop$Action * EDIT;
-  static ::java::awt::Desktop$Action * MAIL;
-  static ::java::awt::Desktop$Action * OPEN;
-  static ::java::awt::Desktop$Action * PRINT;
-private:
-  static JArray< ::java::awt::Desktop$Action * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Desktop$Action__
diff --git a/libjava/java/awt/Desktop.h b/libjava/java/awt/Desktop.h
deleted file mode 100644
index b50a063ff4e..00000000000
--- a/libjava/java/awt/Desktop.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Desktop__
-#define __java_awt_Desktop__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Desktop;
-        class Desktop$Action;
-      namespace peer
-      {
-          class DesktopPeer;
-      }
-    }
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class java::awt::Desktop : public ::java::lang::Object
-{
-
-  Desktop();
-public:
-  static ::java::awt::Desktop * getDesktop();
-  static jboolean isDesktopSupported();
-  virtual jboolean isSupported(::java::awt::Desktop$Action *);
-  virtual void browse(::java::net::URI *);
-  virtual void edit(::java::io::File *);
-  virtual void mail();
-  virtual void mail(::java::net::URI *);
-  virtual void open(::java::io::File *);
-  virtual void print(::java::io::File *);
-private:
-  ::java::awt::peer::DesktopPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Desktop__
diff --git a/libjava/java/awt/Dialog$AccessibleAWTDialog.h b/libjava/java/awt/Dialog$AccessibleAWTDialog.h
deleted file mode 100644
index b8bf577db41..00000000000
--- a/libjava/java/awt/Dialog$AccessibleAWTDialog.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Dialog$AccessibleAWTDialog__
-#define __java_awt_Dialog$AccessibleAWTDialog__
-
-#pragma interface
-
-#include <java/awt/Window$AccessibleAWTWindow.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class Dialog$AccessibleAWTDialog;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::Dialog$AccessibleAWTDialog : public ::java::awt::Window$AccessibleAWTWindow
-{
-
-public: // actually protected
-  Dialog$AccessibleAWTDialog(::java::awt::Dialog *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 4837230331833941201LL;
-public: // actually package-private
-  ::java::awt::Dialog * __attribute__((aligned(__alignof__( ::java::awt::Window$AccessibleAWTWindow)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Dialog$AccessibleAWTDialog__
diff --git a/libjava/java/awt/Dialog$ModalExclusionType.h b/libjava/java/awt/Dialog$ModalExclusionType.h
deleted file mode 100644
index a47a2b4aec4..00000000000
--- a/libjava/java/awt/Dialog$ModalExclusionType.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Dialog$ModalExclusionType__
-#define __java_awt_Dialog$ModalExclusionType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog$ModalExclusionType;
-    }
-  }
-}
-
-class java::awt::Dialog$ModalExclusionType : public ::java::lang::Enum
-{
-
-  Dialog$ModalExclusionType(::java::lang::String *, jint);
-public:
-  static JArray< ::java::awt::Dialog$ModalExclusionType * > * values();
-  static ::java::awt::Dialog$ModalExclusionType * valueOf(::java::lang::String *);
-  static ::java::awt::Dialog$ModalExclusionType * APPLICATION_EXCLUDE;
-  static ::java::awt::Dialog$ModalExclusionType * NO_EXCLUDE;
-  static ::java::awt::Dialog$ModalExclusionType * TOOLKIT_EXCLUDE;
-private:
-  static JArray< ::java::awt::Dialog$ModalExclusionType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Dialog$ModalExclusionType__
diff --git a/libjava/java/awt/Dialog$ModalityType.h b/libjava/java/awt/Dialog$ModalityType.h
deleted file mode 100644
index e7a3b736ee1..00000000000
--- a/libjava/java/awt/Dialog$ModalityType.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Dialog$ModalityType__
-#define __java_awt_Dialog$ModalityType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog$ModalityType;
-    }
-  }
-}
-
-class java::awt::Dialog$ModalityType : public ::java::lang::Enum
-{
-
-  Dialog$ModalityType(::java::lang::String *, jint);
-public:
-  static JArray< ::java::awt::Dialog$ModalityType * > * values();
-  static ::java::awt::Dialog$ModalityType * valueOf(::java::lang::String *);
-  static ::java::awt::Dialog$ModalityType * APPLICATION_MODAL;
-  static ::java::awt::Dialog$ModalityType * DOCUMENT_MODAL;
-  static ::java::awt::Dialog$ModalityType * MODELESS;
-  static ::java::awt::Dialog$ModalityType * TOOLKIT_MODAL;
-private:
-  static JArray< ::java::awt::Dialog$ModalityType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Dialog$ModalityType__
diff --git a/libjava/java/awt/Dialog.h b/libjava/java/awt/Dialog.h
deleted file mode 100644
index b1d339157e0..00000000000
--- a/libjava/java/awt/Dialog.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Dialog__
-#define __java_awt_Dialog__
-
-#pragma interface
-
-#include <java/awt/Window.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class EventQueue;
-        class Frame;
-        class GraphicsConfiguration;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Dialog : public ::java::awt::Window
-{
-
-public:
-  Dialog(::java::awt::Frame *);
-  Dialog(::java::awt::Frame *, jboolean);
-  Dialog(::java::awt::Frame *, ::java::lang::String *);
-  Dialog(::java::awt::Frame *, ::java::lang::String *, jboolean);
-  Dialog(::java::awt::Frame *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
-  Dialog(::java::awt::Dialog *);
-  Dialog(::java::awt::Dialog *, ::java::lang::String *);
-  Dialog(::java::awt::Dialog *, ::java::lang::String *, jboolean);
-  Dialog(::java::awt::Dialog *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
-  virtual ::java::lang::String * getTitle();
-  virtual void setTitle(::java::lang::String *);
-  virtual jboolean isModal();
-  virtual void setModal(jboolean);
-  virtual jboolean isResizable();
-  virtual void setResizable(jboolean);
-  virtual void addNotify();
-  virtual void show();
-  virtual void hide();
-  virtual void dispose();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual jboolean isUndecorated();
-  virtual void setUndecorated(jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = 5920926903803293709LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::Window)))) modal;
-  jboolean resizable;
-  ::java::lang::String * title;
-  jboolean undecorated;
-  jboolean blocked;
-  ::java::awt::EventQueue * eq2;
-  static jlong next_dialog_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Dialog__
diff --git a/libjava/java/awt/Dimension.h b/libjava/java/awt/Dimension.h
deleted file mode 100644
index 7722cabc509..00000000000
--- a/libjava/java/awt/Dimension.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Dimension__
-#define __java_awt_Dimension__
-
-#pragma interface
-
-#include <java/awt/geom/Dimension2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-}
-
-class java::awt::Dimension : public ::java::awt::geom::Dimension2D
-{
-
-public:
-  Dimension();
-  Dimension(::java::awt::Dimension *);
-  Dimension(jint, jint);
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual void setSize(jdouble, jdouble);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setSize(jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4723952579491349524LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::awt::geom::Dimension2D)))) width;
-  jint height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Dimension__
diff --git a/libjava/java/awt/DisplayMode.h b/libjava/java/awt/DisplayMode.h
deleted file mode 100644
index 26561ca0c80..00000000000
--- a/libjava/java/awt/DisplayMode.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_DisplayMode__
-#define __java_awt_DisplayMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class DisplayMode;
-    }
-  }
-}
-
-class java::awt::DisplayMode : public ::java::lang::Object
-{
-
-public:
-  DisplayMode(jint, jint, jint, jint);
-  jint getHeight();
-  jint getWidth();
-  jint getBitDepth();
-  jint getRefreshRate();
-  jboolean equals(::java::awt::DisplayMode *);
-  jint hashCode();
-  static const jint BIT_DEPTH_MULTI = -1;
-  static const jint REFRESH_RATE_UNKNOWN = 0;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint height;
-  jint bitDepth;
-  jint refreshRate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_DisplayMode__
diff --git a/libjava/java/awt/Event.h b/libjava/java/awt/Event.h
deleted file mode 100644
index a0543818dd3..00000000000
--- a/libjava/java/awt/Event.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Event__
-#define __java_awt_Event__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Event;
-    }
-  }
-}
-
-class java::awt::Event : public ::java::lang::Object
-{
-
-public:
-  Event(::java::lang::Object *, jint, ::java::lang::Object *);
-  Event(::java::lang::Object *, jlong, jint, jint, jint, jint, jint);
-  Event(::java::lang::Object *, jlong, jint, jint, jint, jint, jint, ::java::lang::Object *);
-  virtual jboolean controlDown();
-  virtual jboolean metaDown();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual jboolean shiftDown();
-  virtual ::java::lang::String * toString();
-  virtual void translate(jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 5488922509400504703LL;
-public:
-  static const jint SHIFT_MASK = 1;
-  static const jint CTRL_MASK = 2;
-  static const jint META_MASK = 4;
-  static const jint ALT_MASK = 8;
-  static const jint ACTION_EVENT = 1001;
-  static const jint BACK_SPACE = 8;
-  static const jint CAPS_LOCK = 1022;
-  static const jint DELETE = 127;
-  static const jint DOWN = 1005;
-  static const jint END = 1001;
-  static const jint ENTER = 10;
-  static const jint ESCAPE = 27;
-  static const jint F1 = 1008;
-  static const jint F10 = 1017;
-  static const jint F11 = 1018;
-  static const jint F12 = 1019;
-  static const jint F2 = 1009;
-  static const jint F3 = 1010;
-  static const jint F4 = 1011;
-  static const jint F5 = 1012;
-  static const jint F6 = 1013;
-  static const jint F7 = 1014;
-  static const jint F8 = 1015;
-  static const jint F9 = 1016;
-  static const jint GOT_FOCUS = 1004;
-  static const jint HOME = 1000;
-  static const jint INSERT = 1025;
-  static const jint KEY_ACTION = 403;
-  static const jint KEY_ACTION_RELEASE = 404;
-  static const jint KEY_PRESS = 401;
-  static const jint KEY_RELEASE = 402;
-  static const jint LEFT = 1006;
-  static const jint LIST_DESELECT = 702;
-  static const jint LIST_SELECT = 701;
-  static const jint LOAD_FILE = 1002;
-  static const jint LOST_FOCUS = 1005;
-  static const jint MOUSE_DOWN = 501;
-  static const jint MOUSE_DRAG = 506;
-  static const jint MOUSE_ENTER = 504;
-  static const jint MOUSE_EXIT = 505;
-  static const jint MOUSE_MOVE = 503;
-  static const jint MOUSE_UP = 502;
-  static const jint NUM_LOCK = 1023;
-  static const jint PAUSE = 1024;
-  static const jint PGDN = 1003;
-  static const jint PGUP = 1002;
-  static const jint PRINT_SCREEN = 1020;
-  static const jint RIGHT = 1007;
-  static const jint SAVE_FILE = 1003;
-  static const jint SCROLL_ABSOLUTE = 605;
-  static const jint SCROLL_BEGIN = 606;
-  static const jint SCROLL_END = 607;
-  static const jint SCROLL_LINE_DOWN = 602;
-  static const jint SCROLL_LINE_UP = 601;
-  static const jint SCROLL_LOCK = 1021;
-  static const jint SCROLL_PAGE_DOWN = 604;
-  static const jint SCROLL_PAGE_UP = 603;
-  static const jint TAB = 9;
-  static const jint UP = 1004;
-  static const jint WINDOW_DEICONIFY = 204;
-  static const jint WINDOW_DESTROY = 201;
-  static const jint WINDOW_EXPOSE = 202;
-  static const jint WINDOW_ICONIFY = 203;
-  static const jint WINDOW_MOVED = 205;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) arg;
-  jint clickCount;
-public: // actually package-private
-  jboolean consumed;
-public:
-  ::java::awt::Event * evt;
-  jint id;
-  jint key;
-  jint modifiers;
-  ::java::lang::Object * target;
-  jlong when;
-  jint x;
-  jint y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Event__
diff --git a/libjava/java/awt/EventDispatchThread.h b/libjava/java/awt/EventDispatchThread.h
deleted file mode 100644
index a094bdc8a71..00000000000
--- a/libjava/java/awt/EventDispatchThread.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_EventDispatchThread__
-#define __java_awt_EventDispatchThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class EventDispatchThread;
-        class EventQueue;
-    }
-  }
-}
-
-class java::awt::EventDispatchThread : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  EventDispatchThread(::java::awt::EventQueue *);
-public:
-  virtual void run();
-private:
-  static const jint DEFAULT_PRIORITY = 6;
-  static jint dispatchThreadNum;
-  ::java::awt::EventQueue * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) queue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_EventDispatchThread__
diff --git a/libjava/java/awt/EventQueue$Queue.h b/libjava/java/awt/EventQueue$Queue.h
deleted file mode 100644
index 6504a9661ff..00000000000
--- a/libjava/java/awt/EventQueue$Queue.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_EventQueue$Queue__
-#define __java_awt_EventQueue$Queue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class EventQueue;
-        class EventQueue$Queue;
-    }
-  }
-}
-
-class java::awt::EventQueue$Queue : public ::java::lang::Object
-{
-
-  EventQueue$Queue(::java::awt::EventQueue *);
-public: // actually package-private
-  EventQueue$Queue(::java::awt::EventQueue *, ::java::awt::EventQueue$Queue *);
-  ::java::awt::AWTEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queueHead;
-  ::java::awt::AWTEvent * queueTail;
-  ::java::awt::EventQueue * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_EventQueue$Queue__
diff --git a/libjava/java/awt/EventQueue.h b/libjava/java/awt/EventQueue.h
deleted file mode 100644
index 71da1550e98..00000000000
--- a/libjava/java/awt/EventQueue.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_EventQueue__
-#define __java_awt_EventQueue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class EventDispatchThread;
-        class EventQueue;
-        class EventQueue$Queue;
-    }
-  }
-}
-
-class java::awt::EventQueue : public ::java::lang::Object
-{
-
-  jboolean isShutdown();
-public:
-  EventQueue();
-  virtual ::java::awt::AWTEvent * getNextEvent();
-private:
-  ::java::awt::AWTEvent * getNextEventImpl(jboolean);
-public:
-  virtual ::java::awt::AWTEvent * peekEvent();
-  virtual ::java::awt::AWTEvent * peekEvent(jint);
-  virtual void postEvent(::java::awt::AWTEvent *);
-private:
-  void postEventImpl(::java::awt::AWTEvent *);
-  void postEventImpl(::java::awt::AWTEvent *, jint);
-public:
-  static void invokeAndWait(::java::lang::Runnable *);
-  static void invokeLater(::java::lang::Runnable *);
-  static jboolean isDispatchThread();
-  static ::java::awt::AWTEvent * getCurrentEvent();
-  virtual void push(::java::awt::EventQueue *);
-public: // actually protected
-  virtual void pop();
-  virtual void dispatchEvent(::java::awt::AWTEvent *);
-public:
-  static jlong getMostRecentEventTime();
-private:
-  static const jint NORM_PRIORITY = 0;
-  static const jint LOW_PRIORITY = 1;
-  JArray< ::java::awt::EventQueue$Queue * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queues;
-  ::java::awt::EventQueue * next;
-  ::java::awt::EventQueue * prev;
-  ::java::awt::AWTEvent * currentEvent;
-  jlong lastWhen;
-  ::java::awt::EventDispatchThread * dispatchThread;
-  jboolean nativeLoopRunning;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_EventQueue__
diff --git a/libjava/java/awt/FileDialog.h b/libjava/java/awt/FileDialog.h
deleted file mode 100644
index b64300df00d..00000000000
--- a/libjava/java/awt/FileDialog.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FileDialog__
-#define __java_awt_FileDialog__
-
-#pragma interface
-
-#include <java/awt/Dialog.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class FileDialog;
-        class Frame;
-    }
-  }
-}
-
-class java::awt::FileDialog : public ::java::awt::Dialog
-{
-
-public:
-  FileDialog(::java::awt::Dialog *);
-  FileDialog(::java::awt::Dialog *, ::java::lang::String *);
-  FileDialog(::java::awt::Dialog *, ::java::lang::String *, jint);
-  FileDialog(::java::awt::Frame *);
-  FileDialog(::java::awt::Frame *, ::java::lang::String *);
-  FileDialog(::java::awt::Frame *, ::java::lang::String *, jint);
-  virtual jint getMode();
-  virtual void setMode(jint);
-  virtual ::java::lang::String * getDirectory();
-  virtual void setDirectory(::java::lang::String *);
-  virtual ::java::lang::String * getFile();
-  virtual void setFile(::java::lang::String *);
-  virtual ::java::io::FilenameFilter * getFilenameFilter();
-  virtual void setFilenameFilter(::java::io::FilenameFilter *);
-  virtual void addNotify();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  static const jint LOAD = 0;
-  static const jint SAVE = 1;
-private:
-  static const jlong serialVersionUID = 5035145889651310422LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::Dialog)))) dir;
-  ::java::lang::String * file;
-  ::java::io::FilenameFilter * filter;
-  jint mode;
-  static jlong next_file_dialog_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FileDialog__
diff --git a/libjava/java/awt/FlowLayout.h b/libjava/java/awt/FlowLayout.h
deleted file mode 100644
index 202fe18bb4a..00000000000
--- a/libjava/java/awt/FlowLayout.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FlowLayout__
-#define __java_awt_FlowLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class FlowLayout;
-    }
-  }
-}
-
-class java::awt::FlowLayout : public ::java::lang::Object
-{
-
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual jint getAlignment();
-  virtual jint getHgap();
-  virtual jint getVgap();
-  FlowLayout();
-  FlowLayout(jint);
-  FlowLayout(jint, jint, jint);
-  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 setAlignment(jint);
-  virtual void setHgap(jint);
-  virtual void setVgap(jint);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::awt::Dimension * getSize(::java::awt::Container *, jboolean);
-public:
-  static const jint LEFT = 0;
-  static const jint CENTER = 1;
-  static const jint RIGHT = 2;
-  static const jint LEADING = 3;
-  static const jint TRAILING = 4;
-private:
-  static const jlong serialVersionUID = -7262534875583282631LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) align;
-  jint hgap;
-  jint vgap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FlowLayout__
diff --git a/libjava/java/awt/FocusTraversalPolicy.h b/libjava/java/awt/FocusTraversalPolicy.h
deleted file mode 100644
index f4add235fca..00000000000
--- a/libjava/java/awt/FocusTraversalPolicy.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FocusTraversalPolicy__
-#define __java_awt_FocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class FocusTraversalPolicy;
-        class Window;
-    }
-  }
-}
-
-class java::awt::FocusTraversalPolicy : public ::java::lang::Object
-{
-
-public:
-  FocusTraversalPolicy();
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *) = 0;
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *) = 0;
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *) = 0;
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *) = 0;
-  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *) = 0;
-  virtual ::java::awt::Component * getInitialComponent(::java::awt::Window *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FocusTraversalPolicy__
diff --git a/libjava/java/awt/Font.h b/libjava/java/awt/Font.h
deleted file mode 100644
index 46f81a1b846..00000000000
--- a/libjava/java/awt/Font.h
+++ /dev/null
@@ -1,164 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Font__
-#define __java_awt_Font__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-          class ClasspathToolkit;
-        namespace peer
-        {
-            class ClasspathFontPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace peer
-      {
-          class FontPeer;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-        class CharacterIterator;
-    }
-  }
-}
-
-class java::awt::Font : public ::java::lang::Object
-{
-
-public:
-  static ::java::awt::Font * decode(::java::lang::String *);
-public: // actually package-private
-  static ::gnu::java::awt::ClasspathToolkit * tk();
-  static ::java::awt::Font * getFontFromToolkit(::java::lang::String *, ::java::util::Map *);
-  static ::gnu::java::awt::peer::ClasspathFontPeer * getPeerFromToolkit(::java::lang::String *, ::java::util::Map *);
-public:
-  static ::java::awt::Font * getFont(::java::lang::String *, ::java::awt::Font *);
-  static ::java::awt::Font * getFont(::java::lang::String *);
-public: // actually protected
-  Font(::java::awt::Font *);
-public:
-  Font(::java::lang::String *, jint, jint);
-  Font(::java::util::Map *);
-public: // actually package-private
-  Font(::java::lang::String *, ::java::util::Map *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual jint getSize();
-  virtual jfloat getSize2D();
-  virtual jboolean isPlain();
-  virtual jboolean isBold();
-  virtual jboolean isItalic();
-  virtual ::java::lang::String * getFamily();
-  virtual jint getStyle();
-  virtual jboolean canDisplay(jchar);
-  virtual jboolean canDisplay(jint);
-  virtual jint canDisplayUpTo(::java::lang::String *);
-  virtual jint canDisplayUpTo(JArray< jchar > *, jint, jint);
-  virtual jint canDisplayUpTo(::java::text::CharacterIterator *, jint, jint);
-  static ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  static ::java::awt::Font * createFont(jint, ::java::io::File *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::font::FontRenderContext *, ::java::lang::String *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::font::FontRenderContext *, JArray< jchar > *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual ::java::awt::Font * deriveFont(jint, jfloat);
-  virtual ::java::awt::Font * deriveFont(jfloat);
-  virtual ::java::awt::Font * deriveFont(jint);
-  virtual ::java::awt::Font * deriveFont(jint, ::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::Font * deriveFont(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::Font * deriveFont(::java::util::Map *);
-  virtual ::java::util::Map * getAttributes();
-  virtual JArray< ::java::text::AttributedCharacterIterator$Attribute * > * getAvailableAttributes();
-  virtual jbyte getBaselineFor(jchar);
-  virtual ::java::lang::String * getFamily(::java::util::Locale *);
-  static ::java::awt::Font * getFont(::java::util::Map *);
-  virtual ::java::lang::String * getFontName();
-  virtual ::java::lang::String * getFontName(::java::util::Locale *);
-  virtual jfloat getItalicAngle();
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(JArray< jchar > *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::font::FontRenderContext *);
-  virtual jint getMissingGlyphCode();
-  virtual jint getNumGlyphs();
-  virtual ::java::lang::String * getPSName();
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(JArray< jchar > *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual jboolean hasUniformLineMetrics();
-  virtual jboolean isTransformed();
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  virtual ::java::awt::peer::FontPeer * getPeer();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, ::java::awt::font::FontRenderContext *);
-  virtual jboolean hasLayoutAttributes();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  static const jint PLAIN = 0;
-  static const jint BOLD = 1;
-  static const jint ITALIC = 2;
-  static const jint ROMAN_BASELINE = 0;
-  static const jint CENTER_BASELINE = 1;
-  static const jint HANGING_BASELINE = 2;
-  static const jint TRUETYPE_FONT = 0;
-  static const jint TYPE1_FONT = 1;
-  static const jint LAYOUT_LEFT_TO_RIGHT = 0;
-  static const jint LAYOUT_RIGHT_TO_LEFT = 1;
-  static const jint LAYOUT_NO_START_CONTEXT = 2;
-  static const jint LAYOUT_NO_LIMIT_CONTEXT = 4;
-  static ::java::lang::String * DIALOG;
-  static ::java::lang::String * DIALOG_INPUT;
-  static ::java::lang::String * MONOSPACED;
-  static ::java::lang::String * SANS_SERIF;
-  static ::java::lang::String * SERIF;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint size;
-  jfloat pointSize;
-  jint style;
-private:
-  static const jlong serialVersionUID = -4206021311591459213LL;
-  ::gnu::java::awt::peer::ClasspathFontPeer * peer;
-  jint hashCode__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Font__
diff --git a/libjava/java/awt/FontFormatException.h b/libjava/java/awt/FontFormatException.h
deleted file mode 100644
index 9d9ffec9dd5..00000000000
--- a/libjava/java/awt/FontFormatException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FontFormatException__
-#define __java_awt_FontFormatException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class FontFormatException;
-    }
-  }
-}
-
-class java::awt::FontFormatException : public ::java::lang::Exception
-{
-
-public:
-  FontFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4481290147811361272LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FontFormatException__
diff --git a/libjava/java/awt/FontMetrics.h b/libjava/java/awt/FontMetrics.h
deleted file mode 100644
index 67d8b6b4f39..00000000000
--- a/libjava/java/awt/FontMetrics.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FontMetrics__
-#define __java_awt_FontMetrics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-        class Graphics;
-      namespace font
-      {
-          class FontRenderContext;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class java::awt::FontMetrics : public ::java::lang::Object
-{
-
-public: // actually protected
-  FontMetrics(::java::awt::Font *);
-public:
-  virtual ::java::awt::Font * getFont();
-  virtual jint getLeading();
-  virtual jint getAscent();
-  virtual jint getDescent();
-  virtual jint getHeight();
-  virtual jint getMaxAscent();
-  virtual jint getMaxDescent();
-  virtual jint getMaxDecent();
-  virtual jint getMaxAdvance();
-  virtual jint charWidth(jint);
-  virtual jint charWidth(jchar);
-  virtual jint stringWidth(::java::lang::String *);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint bytesWidth(JArray< jbyte > *, jint, jint);
-  virtual JArray< jint > * getWidths();
-  virtual ::java::lang::String * toString();
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, ::java::awt::Graphics *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(JArray< jchar > *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Graphics *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::text::CharacterIterator *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(JArray< jchar > *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::text::CharacterIterator *, jint, jint, ::java::awt::Graphics *);
-private:
-  ::java::awt::font::FontRenderContext * getFontRenderContext(::java::awt::Graphics *);
-public:
-  virtual jboolean hasUniformLineMetrics();
-private:
-  static const jlong serialVersionUID = 1681126225205050147LL;
-public: // actually protected
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::lang::Object)))) font;
-private:
-  static ::java::awt::font::FontRenderContext * gRC;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FontMetrics__
diff --git a/libjava/java/awt/Frame$AccessibleAWTFrame.h b/libjava/java/awt/Frame$AccessibleAWTFrame.h
deleted file mode 100644
index 62ed120a93a..00000000000
--- a/libjava/java/awt/Frame$AccessibleAWTFrame.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Frame$AccessibleAWTFrame__
-#define __java_awt_Frame$AccessibleAWTFrame__
-
-#pragma interface
-
-#include <java/awt/Window$AccessibleAWTWindow.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Frame;
-        class Frame$AccessibleAWTFrame;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::Frame$AccessibleAWTFrame : public ::java::awt::Window$AccessibleAWTWindow
-{
-
-public: // actually protected
-  Frame$AccessibleAWTFrame(::java::awt::Frame *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = -6172960752956030250LL;
-public: // actually package-private
-  ::java::awt::Frame * __attribute__((aligned(__alignof__( ::java::awt::Window$AccessibleAWTWindow)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Frame$AccessibleAWTFrame__
diff --git a/libjava/java/awt/Frame.h b/libjava/java/awt/Frame.h
deleted file mode 100644
index 5b1586631c4..00000000000
--- a/libjava/java/awt/Frame.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Frame__
-#define __java_awt_Frame__
-
-#pragma interface
-
-#include <java/awt/Window.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Frame;
-        class GraphicsConfiguration;
-        class Image;
-        class MenuBar;
-        class MenuComponent;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Frame : public ::java::awt::Window
-{
-
-public:
-  Frame();
-  Frame(::java::lang::String *);
-  Frame(::java::awt::GraphicsConfiguration *);
-  Frame(::java::lang::String *, ::java::awt::GraphicsConfiguration *);
-  virtual ::java::lang::String * getTitle();
-  virtual void setTitle(::java::lang::String *);
-  virtual ::java::awt::Image * getIconImage();
-  virtual void setIconImage(::java::awt::Image *);
-  virtual ::java::awt::MenuBar * getMenuBar();
-  virtual void setMenuBar(::java::awt::MenuBar *);
-  virtual jboolean isResizable();
-  virtual void setResizable(jboolean);
-  virtual jint getCursorType();
-  virtual void setCursor(jint);
-  virtual void remove(::java::awt::MenuComponent *);
-  virtual void addNotify();
-  virtual void removeNotify();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  static void noteFrame(::java::awt::Frame *);
-public: // actually package-private
-  static jboolean hasDisplayableFrames();
-public:
-  static JArray< ::java::awt::Frame * > * getFrames();
-  virtual void setState(jint);
-  virtual jint getState();
-  virtual void setExtendedState(jint);
-  virtual jint getExtendedState();
-  virtual void setMaximizedBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * getMaximizedBounds();
-  virtual jboolean isUndecorated();
-  virtual void setUndecorated(jboolean);
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  static const jint DEFAULT_CURSOR = 0;
-  static const jint CROSSHAIR_CURSOR = 1;
-  static const jint TEXT_CURSOR = 2;
-  static const jint WAIT_CURSOR = 3;
-  static const jint SW_RESIZE_CURSOR = 4;
-  static const jint SE_RESIZE_CURSOR = 5;
-  static const jint NW_RESIZE_CURSOR = 6;
-  static const jint NE_RESIZE_CURSOR = 7;
-  static const jint N_RESIZE_CURSOR = 8;
-  static const jint S_RESIZE_CURSOR = 9;
-  static const jint E_RESIZE_CURSOR = 11;
-  static const jint W_RESIZE_CURSOR = 10;
-  static const jint HAND_CURSOR = 12;
-  static const jint MOVE_CURSOR = 13;
-  static const jint ICONIFIED = 1;
-  static const jint MAXIMIZED_BOTH = 6;
-  static const jint MAXIMIZED_HORIZ = 2;
-  static const jint MAXIMIZED_VERT = 4;
-  static const jint NORMAL = 0;
-private:
-  static const jlong serialVersionUID = 2673458971256075116LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::Window)))) frameSerializedDataVersion;
-  ::java::awt::Image * icon;
-  jboolean mbManagement;
-  ::java::awt::MenuBar * menuBar;
-public: // actually package-private
-  ::java::util::Vector * ownedWindows;
-private:
-  jboolean resizable;
-public: // actually package-private
-  jint state;
-private:
-  ::java::lang::String * title;
-  ::java::awt::Rectangle * maximizedBounds;
-  jboolean undecorated;
-  static jlong next_frame_number;
-  static ::java::util::ArrayList * weakFrames;
-  static ::java::lang::ref::ReferenceQueue * weakFramesQueue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Frame__
diff --git a/libjava/java/awt/GradientPaint.h b/libjava/java/awt/GradientPaint.h
deleted file mode 100644
index 075e139d669..00000000000
--- a/libjava/java/awt/GradientPaint.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GradientPaint__
-#define __java_awt_GradientPaint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class GradientPaint;
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::GradientPaint : public ::java::lang::Object
-{
-
-public:
-  GradientPaint(jfloat, jfloat, ::java::awt::Color *, jfloat, jfloat, ::java::awt::Color *);
-  GradientPaint(::java::awt::geom::Point2D *, ::java::awt::Color *, ::java::awt::geom::Point2D *, ::java::awt::Color *);
-  GradientPaint(jfloat, jfloat, ::java::awt::Color *, jfloat, jfloat, ::java::awt::Color *, jboolean);
-  GradientPaint(::java::awt::geom::Point2D *, ::java::awt::Color *, ::java::awt::geom::Point2D *, ::java::awt::Color *, jboolean);
-  virtual ::java::awt::geom::Point2D * getPoint1();
-  virtual ::java::awt::Color * getColor1();
-  virtual ::java::awt::geom::Point2D * getPoint2();
-  virtual ::java::awt::Color * getColor2();
-  virtual jboolean isCyclic();
-  virtual ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  virtual jint getTransparency();
-private:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) x1;
-  jfloat y1;
-  ::java::awt::Color * c1;
-  jfloat x2;
-  jfloat y2;
-  ::java::awt::Color * c2;
-  jboolean cyclic;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GradientPaint__
diff --git a/libjava/java/awt/Graphics.h b/libjava/java/awt/Graphics.h
deleted file mode 100644
index 504b30ec571..00000000000
--- a/libjava/java/awt/Graphics.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Graphics__
-#define __java_awt_Graphics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Image;
-        class Polygon;
-        class Rectangle;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class java::awt::Graphics : public ::java::lang::Object
-{
-
-public: // actually protected
-  Graphics();
-public:
-  virtual ::java::awt::Graphics * create() = 0;
-  virtual ::java::awt::Graphics * create(jint, jint, jint, jint);
-  virtual void translate(jint, jint) = 0;
-  virtual ::java::awt::Color * getColor() = 0;
-  virtual void setColor(::java::awt::Color *) = 0;
-  virtual void setPaintMode() = 0;
-  virtual void setXORMode(::java::awt::Color *) = 0;
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Rectangle * getClipBounds() = 0;
-  virtual ::java::awt::Rectangle * getClipRect();
-  virtual void clipRect(jint, jint, jint, jint) = 0;
-  virtual void setClip(jint, jint, jint, jint) = 0;
-  virtual ::java::awt::Shape * getClip() = 0;
-  virtual void setClip(::java::awt::Shape *) = 0;
-  virtual void copyArea(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void drawLine(jint, jint, jint, jint) = 0;
-  virtual void fillRect(jint, jint, jint, jint) = 0;
-  virtual void drawRect(jint, jint, jint, jint);
-  virtual void clearRect(jint, jint, jint, jint) = 0;
-  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
-  virtual void drawOval(jint, jint, jint, jint) = 0;
-  virtual void fillOval(jint, jint, jint, jint) = 0;
-  virtual void drawArc(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void fillArc(jint, jint, jint, jint, jint, jint) = 0;
-  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual void drawPolygon(::java::awt::Polygon *);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual void fillPolygon(::java::awt::Polygon *);
-  virtual void drawString(::java::lang::String *, jint, jint) = 0;
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint) = 0;
-  virtual void drawChars(JArray< jchar > *, jint, jint, jint, jint);
-  virtual void drawBytes(JArray< jbyte > *, jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *) = 0;
-  virtual void dispose() = 0;
-  virtual void finalize();
-  virtual ::java::lang::String * toString();
-  virtual jboolean hitClip(jint, jint, jint, jint);
-  virtual ::java::awt::Rectangle * getClipBounds(::java::awt::Rectangle *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Graphics__
diff --git a/libjava/java/awt/Graphics2D.h b/libjava/java/awt/Graphics2D.h
deleted file mode 100644
index 9815434cfc1..00000000000
--- a/libjava/java/awt/Graphics2D.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Graphics2D__
-#define __java_awt_Graphics2D__
-
-#pragma interface
-
-#include <java/awt/Graphics.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Composite;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class Image;
-        class Paint;
-        class Rectangle;
-        class RenderingHints;
-        class RenderingHints$Key;
-        class Shape;
-        class Stroke;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ImageObserver;
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderableImage;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class java::awt::Graphics2D : public ::java::awt::Graphics
-{
-
-public: // actually protected
-  Graphics2D();
-public:
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
-  virtual void draw(::java::awt::Shape *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *) = 0;
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint) = 0;
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *) = 0;
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *) = 0;
-  virtual void drawString(::java::lang::String *, jint, jint) = 0;
-  virtual void drawString(::java::lang::String *, jfloat, jfloat) = 0;
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint) = 0;
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat) = 0;
-  virtual void fill(::java::awt::Shape *) = 0;
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean) = 0;
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration() = 0;
-  virtual void setComposite(::java::awt::Composite *) = 0;
-  virtual void setPaint(::java::awt::Paint *) = 0;
-  virtual void setStroke(::java::awt::Stroke *) = 0;
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *) = 0;
-  virtual void setRenderingHints(::java::util::Map *) = 0;
-  virtual void addRenderingHints(::java::util::Map *) = 0;
-  virtual ::java::awt::RenderingHints * getRenderingHints() = 0;
-  virtual void translate(jint, jint) = 0;
-  virtual void translate(jdouble, jdouble) = 0;
-  virtual void rotate(jdouble) = 0;
-  virtual void rotate(jdouble, jdouble, jdouble) = 0;
-  virtual void scale(jdouble, jdouble) = 0;
-  virtual void shear(jdouble, jdouble) = 0;
-  virtual void transform(::java::awt::geom::AffineTransform *) = 0;
-  virtual void setTransform(::java::awt::geom::AffineTransform *) = 0;
-  virtual ::java::awt::geom::AffineTransform * getTransform() = 0;
-  virtual ::java::awt::Paint * getPaint() = 0;
-  virtual ::java::awt::Composite * getComposite() = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Color * getBackground() = 0;
-  virtual ::java::awt::Stroke * getStroke() = 0;
-  virtual void clip(::java::awt::Shape *) = 0;
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext() = 0;
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Graphics2D__
diff --git a/libjava/java/awt/GraphicsConfigTemplate.h b/libjava/java/awt/GraphicsConfigTemplate.h
deleted file mode 100644
index 53bbece33be..00000000000
--- a/libjava/java/awt/GraphicsConfigTemplate.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GraphicsConfigTemplate__
-#define __java_awt_GraphicsConfigTemplate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfigTemplate;
-        class GraphicsConfiguration;
-    }
-  }
-}
-
-class java::awt::GraphicsConfigTemplate : public ::java::lang::Object
-{
-
-public:
-  GraphicsConfigTemplate();
-  virtual ::java::awt::GraphicsConfiguration * getBestConfiguration(JArray< ::java::awt::GraphicsConfiguration * > *) = 0;
-  virtual jboolean isGraphicsConfigSupported(::java::awt::GraphicsConfiguration *) = 0;
-private:
-  static const jlong serialVersionUID = -8061369279557787079LL;
-public:
-  static const jint REQUIRED = 1;
-  static const jint PREFERRED = 2;
-  static const jint UNNECESSARY = 3;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GraphicsConfigTemplate__
diff --git a/libjava/java/awt/GraphicsConfiguration.h b/libjava/java/awt/GraphicsConfiguration.h
deleted file mode 100644
index 603577ae4ea..00000000000
--- a/libjava/java/awt/GraphicsConfiguration.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GraphicsConfiguration__
-#define __java_awt_GraphicsConfiguration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class GraphicsConfiguration;
-        class GraphicsDevice;
-        class ImageCapabilities;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::GraphicsConfiguration : public ::java::lang::Object
-{
-
-public: // actually protected
-  GraphicsConfiguration();
-public:
-  virtual ::java::awt::GraphicsDevice * getDevice() = 0;
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint) = 0;
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint) = 0;
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, jint) = 0;
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *, jint);
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint, jint) = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel(jint) = 0;
-  virtual ::java::awt::geom::AffineTransform * getDefaultTransform() = 0;
-  virtual ::java::awt::geom::AffineTransform * getNormalizingTransform() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual ::java::awt::BufferCapabilities * getBufferCapabilities();
-  virtual ::java::awt::ImageCapabilities * getImageCapabilities();
-private:
-  ::java::awt::ImageCapabilities * __attribute__((aligned(__alignof__( ::java::lang::Object)))) imageCapabilities;
-  ::java::awt::BufferCapabilities * bufferCapabilities;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GraphicsConfiguration__
diff --git a/libjava/java/awt/GraphicsDevice.h b/libjava/java/awt/GraphicsDevice.h
deleted file mode 100644
index a10d93d8674..00000000000
--- a/libjava/java/awt/GraphicsDevice.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GraphicsDevice__
-#define __java_awt_GraphicsDevice__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class DisplayMode;
-        class GraphicsConfigTemplate;
-        class GraphicsConfiguration;
-        class GraphicsDevice;
-        class Rectangle;
-        class Window;
-    }
-  }
-}
-
-class java::awt::GraphicsDevice : public ::java::lang::Object
-{
-
-public: // actually protected
-  GraphicsDevice();
-public:
-  virtual jint getType() = 0;
-  virtual ::java::lang::String * getIDstring() = 0;
-  virtual JArray< ::java::awt::GraphicsConfiguration * > * getConfigurations() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getDefaultConfiguration() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getBestConfiguration(::java::awt::GraphicsConfigTemplate *);
-  virtual jboolean isFullScreenSupported();
-  virtual void setFullScreenWindow(::java::awt::Window *);
-  virtual ::java::awt::Window * getFullScreenWindow();
-  virtual jboolean isDisplayChangeSupported();
-  virtual void setDisplayMode(::java::awt::DisplayMode *);
-  virtual ::java::awt::DisplayMode * getDisplayMode();
-  virtual JArray< ::java::awt::DisplayMode * > * getDisplayModes();
-  virtual jint getAvailableAcceleratedMemory();
-  static const jint TYPE_RASTER_SCREEN = 0;
-  static const jint TYPE_PRINTER = 1;
-  static const jint TYPE_IMAGE_BUFFER = 2;
-private:
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::lang::Object)))) full_screen;
-  ::java::awt::Rectangle * fullScreenOldBounds;
-  ::java::awt::DisplayMode * mode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GraphicsDevice__
diff --git a/libjava/java/awt/GraphicsEnvironment.h b/libjava/java/awt/GraphicsEnvironment.h
deleted file mode 100644
index 398e295bfca..00000000000
--- a/libjava/java/awt/GraphicsEnvironment.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GraphicsEnvironment__
-#define __java_awt_GraphicsEnvironment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class java::awt::GraphicsEnvironment : public ::java::lang::Object
-{
-
-public: // actually protected
-  GraphicsEnvironment();
-public:
-  static ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  static jboolean isHeadless();
-  virtual jboolean isHeadlessInstance();
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices() = 0;
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice() = 0;
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *) = 0;
-  virtual JArray< ::java::awt::Font * > * getAllFonts() = 0;
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames() = 0;
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *) = 0;
-  virtual ::java::awt::Point * getCenterPoint();
-  virtual ::java::awt::Rectangle * getMaximumWindowBounds();
-private:
-  static ::java::awt::GraphicsEnvironment * localGraphicsEnvironment;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GraphicsEnvironment__
diff --git a/libjava/java/awt/GridBagConstraints.h b/libjava/java/awt/GridBagConstraints.h
deleted file mode 100644
index 95d359e1946..00000000000
--- a/libjava/java/awt/GridBagConstraints.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GridBagConstraints__
-#define __java_awt_GridBagConstraints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GridBagConstraints;
-        class Insets;
-    }
-  }
-}
-
-class java::awt::GridBagConstraints : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-  GridBagConstraints();
-  GridBagConstraints(jint, jint, jint, jint, jdouble, jdouble, jint, jint, ::java::awt::Insets *, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = -1000070633030801713LL;
-public:
-  static const jint NONE = 0;
-  static const jint BOTH = 1;
-  static const jint HORIZONTAL = 2;
-  static const jint VERTICAL = 3;
-  static const jint CENTER = 10;
-  static const jint NORTH = 11;
-  static const jint NORTHEAST = 12;
-  static const jint EAST = 13;
-  static const jint SOUTHEAST = 14;
-  static const jint SOUTH = 15;
-  static const jint SOUTHWEST = 16;
-  static const jint WEST = 17;
-  static const jint NORTHWEST = 18;
-  static const jint RELATIVE = -1;
-  static const jint REMAINDER = 0;
-  static const jint PAGE_START = 19;
-  static const jint PAGE_END = 20;
-  static const jint LINE_START = 21;
-  static const jint LINE_END = 22;
-  static const jint FIRST_LINE_START = 23;
-  static const jint FIRST_LINE_END = 24;
-  static const jint LAST_LINE_START = 25;
-  static const jint LAST_LINE_END = 26;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) anchor;
-  jint fill;
-  jint gridheight;
-  jint gridwidth;
-  jint gridx;
-  jint gridy;
-  ::java::awt::Insets * insets;
-  jint ipadx;
-  jint ipady;
-  jdouble weightx;
-  jdouble weighty;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GridBagConstraints__
diff --git a/libjava/java/awt/GridBagLayout.h b/libjava/java/awt/GridBagLayout.h
deleted file mode 100644
index b553aff4eb3..00000000000
--- a/libjava/java/awt/GridBagLayout.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GridBagLayout__
-#define __java_awt_GridBagLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class GridBagConstraints;
-        class GridBagLayout;
-        class GridBagLayoutInfo;
-        class Point;
-        class Rectangle;
-    }
-  }
-}
-
-class java::awt::GridBagLayout : public ::java::lang::Object
-{
-
-public:
-  GridBagLayout();
-private:
-  jint sumIntArray(JArray< jint > *, jint);
-  jint sumIntArray(JArray< jint > *);
-  jdouble sumDoubleArray(JArray< jdouble > *);
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  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 void layoutContainer(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void setConstraints(::java::awt::Component *, ::java::awt::GridBagConstraints *);
-  virtual ::java::awt::GridBagConstraints * getConstraints(::java::awt::Component *);
-public: // actually protected
-  virtual ::java::awt::GridBagConstraints * lookupConstraints(::java::awt::Component *);
-private:
-  ::java::awt::GridBagConstraints * lookupInternalConstraints(::java::awt::Component *);
-public:
-  virtual ::java::awt::Point * getLayoutOrigin();
-  virtual JArray< JArray< jint > * > * getLayoutDimensions();
-  virtual JArray< JArray< jdouble > * > * getLayoutWeights();
-  virtual ::java::awt::Point * location(jint, jint);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual void AdjustForGravity(::java::awt::GridBagConstraints *, ::java::awt::Rectangle *);
-  virtual void ArrangeGrid(::java::awt::Container *);
-  virtual ::java::awt::GridBagLayoutInfo * GetLayoutInfo(::java::awt::Container *, jint);
-  virtual ::java::awt::Dimension * GetMinSize(::java::awt::Container *, ::java::awt::GridBagLayoutInfo *);
-  virtual ::java::awt::Dimension * getMinSize(::java::awt::Container *, ::java::awt::GridBagLayoutInfo *);
-private:
-  void sortBySpan(::java::awt::Component *, jint, ::java::util::ArrayList *, jboolean);
-  void distributeSizeAndWeight(jint, jdouble, jint, jint, JArray< jint > *, JArray< jdouble > *);
-  void calcCellWeights(jdouble, JArray< jdouble > *, jint, jint);
-  void calcCellSizes(JArray< jint > *, JArray< jdouble > *, jint);
-  void dumpLayoutInfo(::java::awt::GridBagLayoutInfo *);
-  void dumpArray(JArray< jint > *);
-  void dumpArray(JArray< jdouble > *);
-public: // actually protected
-  virtual void arrangeGrid(::java::awt::Container *);
-  virtual ::java::awt::GridBagLayoutInfo * getLayoutInfo(::java::awt::Container *, jint);
-  virtual void adjustForGravity(::java::awt::GridBagConstraints *, ::java::awt::Rectangle *);
-private:
-  static const jlong serialVersionUID = 8838754796412211005LL;
-public: // actually protected
-  static const jint MINSIZE = 1;
-  static const jint PREFERREDSIZE = 2;
-  static const jint MAXGRIDSIZE = 512;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) comptable;
-private:
-  ::java::util::Hashtable * internalcomptable;
-public: // actually protected
-  ::java::awt::GridBagLayoutInfo * layoutInfo;
-  ::java::awt::GridBagConstraints * defaultConstraints;
-public:
-  JArray< jdouble > * columnWeights;
-  JArray< jint > * columnWidths;
-  JArray< jdouble > * rowWeights;
-  JArray< jint > * rowHeights;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GridBagLayout__
diff --git a/libjava/java/awt/GridBagLayoutInfo.h b/libjava/java/awt/GridBagLayoutInfo.h
deleted file mode 100644
index b83497ff9fe..00000000000
--- a/libjava/java/awt/GridBagLayoutInfo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GridBagLayoutInfo__
-#define __java_awt_GridBagLayoutInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GridBagLayoutInfo;
-    }
-  }
-}
-
-class java::awt::GridBagLayoutInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GridBagLayoutInfo(jint, jint);
-private:
-  static const jlong serialVersionUID = -4899416460737170217LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos_x;
-  jint pos_y;
-  jint cols;
-  jint rows;
-  JArray< jint > * colWidths;
-  JArray< jint > * rowHeights;
-  JArray< jdouble > * colWeights;
-  JArray< jdouble > * rowWeights;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GridBagLayoutInfo__
diff --git a/libjava/java/awt/GridLayout.h b/libjava/java/awt/GridLayout.h
deleted file mode 100644
index 84b01a27c7b..00000000000
--- a/libjava/java/awt/GridLayout.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GridLayout__
-#define __java_awt_GridLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class GridLayout;
-    }
-  }
-}
-
-class java::awt::GridLayout : public ::java::lang::Object
-{
-
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual jint getColumns();
-  virtual jint getHgap();
-  virtual jint getRows();
-  virtual jint getVgap();
-  GridLayout();
-  GridLayout(jint, jint);
-  GridLayout(jint, jint, jint, jint);
-  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 setColumns(jint);
-  virtual void setHgap(jint);
-  virtual void setRows(jint);
-  virtual void setVgap(jint);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::awt::Dimension * getSize(::java::awt::Container *, jboolean);
-public: // actually package-private
-  static const jlong serialVersionUID = -7411804673224730901LL;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) cols;
-  jint rows;
-  jint hgap;
-  jint vgap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GridLayout__
diff --git a/libjava/java/awt/HeadlessException.h b/libjava/java/awt/HeadlessException.h
deleted file mode 100644
index f57ea63fb91..00000000000
--- a/libjava/java/awt/HeadlessException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_HeadlessException__
-#define __java_awt_HeadlessException__
-
-#pragma interface
-
-#include <java/lang/UnsupportedOperationException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class HeadlessException;
-    }
-  }
-}
-
-class java::awt::HeadlessException : public ::java::lang::UnsupportedOperationException
-{
-
-public:
-  HeadlessException();
-  HeadlessException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 167183644944358563LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_HeadlessException__
diff --git a/libjava/java/awt/IllegalComponentStateException.h b/libjava/java/awt/IllegalComponentStateException.h
deleted file mode 100644
index 9743e59f05a..00000000000
--- a/libjava/java/awt/IllegalComponentStateException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_IllegalComponentStateException__
-#define __java_awt_IllegalComponentStateException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class IllegalComponentStateException;
-    }
-  }
-}
-
-class java::awt::IllegalComponentStateException : public ::java::lang::IllegalStateException
-{
-
-public:
-  IllegalComponentStateException();
-  IllegalComponentStateException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1889339587208144238LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_IllegalComponentStateException__
diff --git a/libjava/java/awt/Image.h b/libjava/java/awt/Image.h
deleted file mode 100644
index d49664a2238..00000000000
--- a/libjava/java/awt/Image.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Image__
-#define __java_awt_Image__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::Image : public ::java::lang::Object
-{
-
-public:
-  Image();
-  virtual jint getWidth(::java::awt::image::ImageObserver *) = 0;
-  virtual jint getHeight(::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::image::ImageProducer * getSource() = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * getScaledInstance(jint, jint, jint);
-  virtual void flush() = 0;
-  virtual void setAccelerationPriority(jfloat);
-  virtual jfloat getAccelerationPriority();
-  static ::java::lang::Object * UndefinedProperty;
-  static const jint SCALE_DEFAULT = 1;
-  static const jint SCALE_FAST = 2;
-  static const jint SCALE_SMOOTH = 4;
-  static const jint SCALE_REPLICATE = 8;
-  static const jint SCALE_AREA_AVERAGING = 16;
-public: // actually protected
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) accelerationPriority;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Image__
diff --git a/libjava/java/awt/ImageCapabilities.h b/libjava/java/awt/ImageCapabilities.h
deleted file mode 100644
index 8a245f39069..00000000000
--- a/libjava/java/awt/ImageCapabilities.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ImageCapabilities__
-#define __java_awt_ImageCapabilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ImageCapabilities;
-    }
-  }
-}
-
-class java::awt::ImageCapabilities : public ::java::lang::Object
-{
-
-public:
-  ImageCapabilities(jboolean);
-  virtual jboolean isAccelerated();
-  virtual jboolean isTrueVolatile();
-  virtual ::java::lang::Object * clone();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) accelerated;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ImageCapabilities__
diff --git a/libjava/java/awt/Insets.h b/libjava/java/awt/Insets.h
deleted file mode 100644
index 14d70fed5c6..00000000000
--- a/libjava/java/awt/Insets.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Insets__
-#define __java_awt_Insets__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-    }
-  }
-}
-
-class java::awt::Insets : public ::java::lang::Object
-{
-
-public:
-  Insets(jint, jint, jint, jint);
-  virtual void set(jint, jint, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::Object * clone();
-private:
-  static const jlong serialVersionUID = -2272572637695466749LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) top;
-  jint left;
-  jint bottom;
-  jint right;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Insets__
diff --git a/libjava/java/awt/ItemSelectable.h b/libjava/java/awt/ItemSelectable.h
deleted file mode 100644
index 3ff72d344b1..00000000000
--- a/libjava/java/awt/ItemSelectable.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ItemSelectable__
-#define __java_awt_ItemSelectable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ItemSelectable;
-      namespace event
-      {
-          class ItemListener;
-      }
-    }
-  }
-}
-
-class java::awt::ItemSelectable : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects() = 0;
-  virtual void addItemListener(::java::awt::event::ItemListener *) = 0;
-  virtual void removeItemListener(::java::awt::event::ItemListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_ItemSelectable__
diff --git a/libjava/java/awt/JobAttributes$DefaultSelectionType.h b/libjava/java/awt/JobAttributes$DefaultSelectionType.h
deleted file mode 100644
index 34779779d67..00000000000
--- a/libjava/java/awt/JobAttributes$DefaultSelectionType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$DefaultSelectionType__
-#define __java_awt_JobAttributes$DefaultSelectionType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$DefaultSelectionType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$DefaultSelectionType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$DefaultSelectionType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$DefaultSelectionType * ALL;
-  static ::java::awt::JobAttributes$DefaultSelectionType * RANGE;
-  static ::java::awt::JobAttributes$DefaultSelectionType * SELECTION;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$DefaultSelectionType__
diff --git a/libjava/java/awt/JobAttributes$DestinationType.h b/libjava/java/awt/JobAttributes$DestinationType.h
deleted file mode 100644
index 6c15bd59d97..00000000000
--- a/libjava/java/awt/JobAttributes$DestinationType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$DestinationType__
-#define __java_awt_JobAttributes$DestinationType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$DestinationType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$DestinationType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$DestinationType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$DestinationType * FILE;
-  static ::java::awt::JobAttributes$DestinationType * PRINTER;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$DestinationType__
diff --git a/libjava/java/awt/JobAttributes$DialogType.h b/libjava/java/awt/JobAttributes$DialogType.h
deleted file mode 100644
index 77ae7916d8e..00000000000
--- a/libjava/java/awt/JobAttributes$DialogType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$DialogType__
-#define __java_awt_JobAttributes$DialogType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$DialogType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$DialogType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$DialogType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$DialogType * COMMON;
-  static ::java::awt::JobAttributes$DialogType * NATIVE;
-  static ::java::awt::JobAttributes$DialogType * NONE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$DialogType__
diff --git a/libjava/java/awt/JobAttributes$MultipleDocumentHandlingType.h b/libjava/java/awt/JobAttributes$MultipleDocumentHandlingType.h
deleted file mode 100644
index a4b13448fcb..00000000000
--- a/libjava/java/awt/JobAttributes$MultipleDocumentHandlingType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$MultipleDocumentHandlingType__
-#define __java_awt_JobAttributes$MultipleDocumentHandlingType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$MultipleDocumentHandlingType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$MultipleDocumentHandlingType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$MultipleDocumentHandlingType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$MultipleDocumentHandlingType * SEPARATE_DOCUMENTS_COLLATED_COPIES;
-  static ::java::awt::JobAttributes$MultipleDocumentHandlingType * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$MultipleDocumentHandlingType__
diff --git a/libjava/java/awt/JobAttributes$SidesType.h b/libjava/java/awt/JobAttributes$SidesType.h
deleted file mode 100644
index 349c3c07729..00000000000
--- a/libjava/java/awt/JobAttributes$SidesType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$SidesType__
-#define __java_awt_JobAttributes$SidesType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$SidesType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$SidesType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$SidesType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$SidesType * ONE_SIDED;
-  static ::java::awt::JobAttributes$SidesType * TWO_SIDED_LONG_EDGE;
-  static ::java::awt::JobAttributes$SidesType * TWO_SIDED_SHORT_EDGE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$SidesType__
diff --git a/libjava/java/awt/JobAttributes.h b/libjava/java/awt/JobAttributes.h
deleted file mode 100644
index 400bbcfc5b2..00000000000
--- a/libjava/java/awt/JobAttributes.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes__
-#define __java_awt_JobAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes;
-        class JobAttributes$DefaultSelectionType;
-        class JobAttributes$DestinationType;
-        class JobAttributes$DialogType;
-        class JobAttributes$MultipleDocumentHandlingType;
-        class JobAttributes$SidesType;
-    }
-  }
-}
-
-class java::awt::JobAttributes : public ::java::lang::Object
-{
-
-public:
-  JobAttributes();
-  JobAttributes(::java::awt::JobAttributes *);
-  JobAttributes(jint, ::java::awt::JobAttributes$DefaultSelectionType *, ::java::awt::JobAttributes$DestinationType *, ::java::awt::JobAttributes$DialogType *, ::java::lang::String *, jint, jint, ::java::awt::JobAttributes$MultipleDocumentHandlingType *, JArray< JArray< jint > * > *, ::java::lang::String *, ::java::awt::JobAttributes$SidesType *);
-  ::java::lang::Object * clone();
-  void set(::java::awt::JobAttributes *);
-  jint getCopies();
-  void setCopies(jint);
-  void setCopiesToDefault();
-  ::java::awt::JobAttributes$DefaultSelectionType * getDefaultSelection();
-  void setDefaultSelection(::java::awt::JobAttributes$DefaultSelectionType *);
-  ::java::awt::JobAttributes$DestinationType * getDestination();
-  void setDestination(::java::awt::JobAttributes$DestinationType *);
-  ::java::awt::JobAttributes$DialogType * getDialog();
-  void setDialog(::java::awt::JobAttributes$DialogType *);
-  ::java::lang::String * getFileName();
-  void setFileName(::java::lang::String *);
-  jint getFromPage();
-  void setFromPage(jint);
-  jint getMaxPage();
-  void setMaxPage(jint);
-  jint getMinPage();
-  void setMinPage(jint);
-  ::java::awt::JobAttributes$MultipleDocumentHandlingType * getMultipleDocumentHandling();
-  void setMultipleDocumentHandling(::java::awt::JobAttributes$MultipleDocumentHandlingType *);
-  void setMultipleDocumentHandlingToDefault();
-  JArray< JArray< jint > * > * getPageRanges();
-  void setPageRanges(JArray< JArray< jint > * > *);
-  ::java::lang::String * getPrinter();
-  void setPrinter(::java::lang::String *);
-  ::java::awt::JobAttributes$SidesType * getSides();
-  void setSides(::java::awt::JobAttributes$SidesType *);
-  void setSidesToDefault();
-  jint getToPage();
-  void setToPage(jint);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) copies;
-  ::java::awt::JobAttributes$DefaultSelectionType * selection;
-  ::java::awt::JobAttributes$DestinationType * destination;
-  ::java::awt::JobAttributes$DialogType * dialog;
-  ::java::lang::String * filename;
-  jint maxPage;
-  jint minPage;
-  ::java::awt::JobAttributes$MultipleDocumentHandlingType * multiple;
-  JArray< JArray< jint > * > * pageRanges;
-  jint fromPage;
-  jint toPage;
-  ::java::lang::String * printer;
-  ::java::awt::JobAttributes$SidesType * sides;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes__
diff --git a/libjava/java/awt/KeyEventDispatcher.h b/libjava/java/awt/KeyEventDispatcher.h
deleted file mode 100644
index fdb3195d146..00000000000
--- a/libjava/java/awt/KeyEventDispatcher.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_KeyEventDispatcher__
-#define __java_awt_KeyEventDispatcher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class KeyEventDispatcher;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::KeyEventDispatcher : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_KeyEventDispatcher__
diff --git a/libjava/java/awt/KeyEventPostProcessor.h b/libjava/java/awt/KeyEventPostProcessor.h
deleted file mode 100644
index 806e1450b7c..00000000000
--- a/libjava/java/awt/KeyEventPostProcessor.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_KeyEventPostProcessor__
-#define __java_awt_KeyEventPostProcessor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class KeyEventPostProcessor;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::KeyEventPostProcessor : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_KeyEventPostProcessor__
diff --git a/libjava/java/awt/KeyboardFocusManager.h b/libjava/java/awt/KeyboardFocusManager.h
deleted file mode 100644
index 9fd045c460c..00000000000
--- a/libjava/java/awt/KeyboardFocusManager.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_KeyboardFocusManager__
-#define __java_awt_KeyboardFocusManager__
-
-#pragma interface
-
-#include <java/lang/Object.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 PropertyChangeSupport;
-        class VetoableChangeListener;
-        class VetoableChangeSupport;
-    }
-  }
-}
-
-class java::awt::KeyboardFocusManager : public ::java::lang::Object
-{
-
-public:
-  KeyboardFocusManager();
-  static ::java::awt::KeyboardFocusManager * getCurrentKeyboardFocusManager();
-  static void setCurrentKeyboardFocusManager(::java::awt::KeyboardFocusManager *);
-  virtual ::java::awt::Component * getFocusOwner();
-public: // actually protected
-  virtual ::java::awt::Component * getGlobalFocusOwner();
-  virtual void setGlobalFocusOwner(::java::awt::Component *);
-public:
-  virtual void clearGlobalFocusOwner();
-  virtual ::java::awt::Component * getPermanentFocusOwner();
-public: // actually protected
-  virtual ::java::awt::Component * getGlobalPermanentFocusOwner();
-  virtual void setGlobalPermanentFocusOwner(::java::awt::Component *);
-public:
-  virtual ::java::awt::Window * getFocusedWindow();
-public: // actually protected
-  virtual ::java::awt::Window * getGlobalFocusedWindow();
-  virtual void setGlobalFocusedWindow(::java::awt::Window *);
-public:
-  virtual ::java::awt::Window * getActiveWindow();
-public: // actually protected
-  virtual ::java::awt::Window * getGlobalActiveWindow();
-  virtual void setGlobalActiveWindow(::java::awt::Window *);
-public:
-  virtual ::java::awt::FocusTraversalPolicy * getDefaultFocusTraversalPolicy();
-  virtual void setDefaultFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
-  virtual void setDefaultFocusTraversalKeys(jint, ::java::util::Set *);
-  virtual ::java::util::Set * getDefaultFocusTraversalKeys(jint);
-  virtual ::java::awt::Container * getCurrentFocusCycleRoot();
-public: // actually protected
-  virtual ::java::awt::Container * getGlobalCurrentFocusCycleRoot();
-public:
-  virtual void setGlobalCurrentFocusCycleRoot(::java::awt::Container *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners(::java::lang::String *);
-public: // actually protected
-  virtual void fireVetoableChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void addKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
-  virtual void removeKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
-public: // actually protected
-  virtual ::java::util::List * getKeyEventDispatchers();
-public:
-  virtual void addKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
-  virtual void removeKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
-public: // actually protected
-  virtual ::java::util::List * getKeyEventPostProcessors();
-public:
-  virtual jboolean dispatchEvent(::java::awt::AWTEvent *) = 0;
-  virtual void redispatchEvent(::java::awt::Component *, ::java::awt::AWTEvent *);
-  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *) = 0;
-public: // actually protected
-  virtual void enqueueKeyEvents(jlong, ::java::awt::Component *) = 0;
-  virtual void dequeueKeyEvents(jlong, ::java::awt::Component *) = 0;
-  virtual void discardKeyEvents(::java::awt::Component *) = 0;
-public:
-  virtual void focusNextComponent(::java::awt::Component *) = 0;
-  virtual void focusPreviousComponent(::java::awt::Component *) = 0;
-  virtual void upFocusCycle(::java::awt::Component *) = 0;
-  virtual void downFocusCycle(::java::awt::Container *) = 0;
-  virtual void focusNextComponent();
-  virtual void focusPreviousComponent();
-  virtual void upFocusCycle();
-  virtual void downFocusCycle();
-private:
-  ::java::lang::Object * getObject(::java::util::Map *);
-  ::java::lang::Object * getGlobalObject(::java::util::Map *, jboolean);
-  void setGlobalObject(::java::util::Map *, ::java::lang::Object *, ::java::lang::String *);
-public: // actually package-private
-  static ::java::awt::AWTEvent * retargetFocusEvent(::java::awt::AWTEvent *);
-  static void addLightweightFocusRequest(::java::awt::Component *, ::java::awt::Component *);
-public:
-  static const jint FORWARD_TRAVERSAL_KEYS = 0;
-  static const jint BACKWARD_TRAVERSAL_KEYS = 1;
-  static const jint UP_CYCLE_TRAVERSAL_KEYS = 2;
-  static const jint DOWN_CYCLE_TRAVERSAL_KEYS = 3;
-private:
-  static ::java::util::Set * DEFAULT_FORWARD_KEYS;
-  static ::java::util::Set * DEFAULT_BACKWARD_KEYS;
-  static ::java::util::Map * currentKeyboardFocusManagers;
-  static ::java::util::Map * currentFocusOwners;
-  static ::java::util::Map * currentPermanentFocusOwners;
-  static ::java::util::Map * currentFocusedWindows;
-  static ::java::util::Map * currentActiveWindows;
-  static ::java::util::Map * currentFocusCycleRoots;
-  ::java::awt::FocusTraversalPolicy * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultPolicy;
-  JArray< ::java::util::Set * > * defaultFocusKeys;
-  ::java::beans::PropertyChangeSupport * propertyChangeSupport;
-  ::java::beans::VetoableChangeSupport * vetoableChangeSupport;
-  ::java::util::ArrayList * keyEventDispatchers;
-  ::java::util::ArrayList * keyEventPostProcessors;
-  static ::java::util::HashMap * focusRequests;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_KeyboardFocusManager__
diff --git a/libjava/java/awt/Label$AccessibleAWTLabel.h b/libjava/java/awt/Label$AccessibleAWTLabel.h
deleted file mode 100644
index 7301841bc28..00000000000
--- a/libjava/java/awt/Label$AccessibleAWTLabel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Label$AccessibleAWTLabel__
-#define __java_awt_Label$AccessibleAWTLabel__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-        class Label$AccessibleAWTLabel;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Label$AccessibleAWTLabel : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  Label$AccessibleAWTLabel(::java::awt::Label *);
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -3568967560160480438LL;
-public: // actually package-private
-  ::java::awt::Label * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Label$AccessibleAWTLabel__
diff --git a/libjava/java/awt/Label.h b/libjava/java/awt/Label.h
deleted file mode 100644
index d3151604d9a..00000000000
--- a/libjava/java/awt/Label.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Label__
-#define __java_awt_Label__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Label : public ::java::awt::Component
-{
-
-public:
-  Label();
-  Label(::java::lang::String *);
-  Label(::java::lang::String *, jint);
-  virtual jint getAlignment();
-  virtual void setAlignment(jint);
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual void addNotify();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  static const jint LEFT = 0;
-  static const jint CENTER = 1;
-  static const jint RIGHT = 2;
-private:
-  static const jlong serialVersionUID = 3094126758329070636LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::Component)))) alignment;
-  ::java::lang::String * text;
-  static jlong nextLabelNumber;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Label__
diff --git a/libjava/java/awt/LayoutManager.h b/libjava/java/awt/LayoutManager.h
deleted file mode 100644
index 464871c049c..00000000000
--- a/libjava/java/awt/LayoutManager.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_LayoutManager__
-#define __java_awt_LayoutManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class LayoutManager;
-    }
-  }
-}
-
-class java::awt::LayoutManager : public ::java::lang::Object
-{
-
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *) = 0;
-  virtual void removeLayoutComponent(::java::awt::Component *) = 0;
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *) = 0;
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *) = 0;
-  virtual void layoutContainer(::java::awt::Container *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_LayoutManager__
diff --git a/libjava/java/awt/LayoutManager2.h b/libjava/java/awt/LayoutManager2.h
deleted file mode 100644
index 7c8331bd64d..00000000000
--- a/libjava/java/awt/LayoutManager2.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_LayoutManager2__
-#define __java_awt_LayoutManager2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class LayoutManager2;
-    }
-  }
-}
-
-class java::awt::LayoutManager2 : public ::java::lang::Object
-{
-
-public:
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *) = 0;
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *) = 0;
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *) = 0;
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *) = 0;
-  virtual void invalidateLayout(::java::awt::Container *) = 0;
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *) = 0;
-  virtual void removeLayoutComponent(::java::awt::Component *) = 0;
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *) = 0;
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *) = 0;
-  virtual void layoutContainer(::java::awt::Container *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_LayoutManager2__
diff --git a/libjava/java/awt/LightweightDispatcher.h b/libjava/java/awt/LightweightDispatcher.h
deleted file mode 100644
index 4fee8f8b43f..00000000000
--- a/libjava/java/awt/LightweightDispatcher.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_LightweightDispatcher__
-#define __java_awt_LightweightDispatcher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-        class Container;
-        class LightweightDispatcher;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class java::awt::LightweightDispatcher : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static ::java::awt::LightweightDispatcher * getInstance();
-private:
-  LightweightDispatcher();
-public:
-  jboolean dispatchEvent(::java::awt::AWTEvent *);
-private:
-  jboolean handleMouseEvent(::java::awt::event::MouseEvent *);
-  ::java::awt::Component * findTarget(::java::awt::Container *, jint, jint);
-  jboolean isMouseListening(::java::awt::Component *);
-  void trackEnterExit(::java::awt::Component *, ::java::awt::event::MouseEvent *);
-  void redispatch(::java::awt::event::MouseEvent *, ::java::awt::Component *, jint);
-  jboolean isDragging(::java::awt::event::MouseEvent *);
-  static ::java::util::WeakHashMap * instances;
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastTarget;
-  ::java::awt::Component * mouseEventTarget;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_LightweightDispatcher__
diff --git a/libjava/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.h b/libjava/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.h
deleted file mode 100644
index 7014fd93007..00000000000
--- a/libjava/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_List$AccessibleAWTList$AccessibleAWTListChild__
-#define __java_awt_List$AccessibleAWTList$AccessibleAWTListChild__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class List;
-        class List$AccessibleAWTList;
-        class List$AccessibleAWTList$AccessibleAWTListChild;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::List$AccessibleAWTList$AccessibleAWTListChild : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  List$AccessibleAWTList$AccessibleAWTListChild(::java::awt::List$AccessibleAWTList *, ::java::awt::List *, jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-private:
-  static const jlong serialVersionUID = 4412022926028300317LL;
-  ::java::awt::List * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) parent;
-  jint indexInParent;
-public: // actually package-private
-  ::java::awt::List$AccessibleAWTList * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_List$AccessibleAWTList$AccessibleAWTListChild__
diff --git a/libjava/java/awt/List$AccessibleAWTList.h b/libjava/java/awt/List$AccessibleAWTList.h
deleted file mode 100644
index ca0dcaa5f19..00000000000
--- a/libjava/java/awt/List$AccessibleAWTList.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_List$AccessibleAWTList__
-#define __java_awt_List$AccessibleAWTList__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class List;
-        class List$AccessibleAWTList;
-      namespace event
-      {
-          class ActionEvent;
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::List$AccessibleAWTList : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  List$AccessibleAWTList(::java::awt::List *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  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 itemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  static ::java::awt::List * access$0(::java::awt::List$AccessibleAWTList *);
-private:
-  static const jlong serialVersionUID = 7924617370136012829LL;
-public: // actually package-private
-  ::java::awt::List * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_List$AccessibleAWTList__
diff --git a/libjava/java/awt/List.h b/libjava/java/awt/List.h
deleted file mode 100644
index ba11b18d8b9..00000000000
--- a/libjava/java/awt/List.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_List__
-#define __java_awt_List__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Dimension;
-        class List;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::List : public ::java::awt::Component
-{
-
-public:
-  List();
-  List(jint);
-  List(jint, jboolean);
-  virtual jint getItemCount();
-  virtual jint countItems();
-  virtual JArray< ::java::lang::String * > * getItems();
-  virtual ::java::lang::String * getItem(jint);
-  virtual jint getRows();
-  virtual jboolean isMultipleMode();
-  virtual jboolean allowsMultipleSelections();
-  virtual void setMultipleMode(jboolean);
-  virtual void setMultipleSelections(jboolean);
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void add(::java::lang::String *);
-  virtual void addItem(::java::lang::String *);
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void delItem(jint);
-  virtual void remove(jint);
-  virtual void delItems(jint, jint);
-  virtual void remove(::java::lang::String *);
-  virtual void removeAll();
-  virtual void clear();
-  virtual void replaceItem(::java::lang::String *, jint);
-  virtual jint getSelectedIndex();
-  virtual JArray< jint > * getSelectedIndexes();
-  virtual ::java::lang::String * getSelectedItem();
-  virtual JArray< ::java::lang::String * > * getSelectedItems();
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual jboolean isIndexSelected(jint);
-  virtual jboolean isSelected(jint);
-  virtual void makeVisible(jint);
-  virtual jint getVisibleIndex();
-  virtual void select(jint);
-  virtual void deselect(jint);
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processActionEvent(::java::awt::event::ActionEvent *);
-  virtual void processItemEvent(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_list_number;
-  static const jlong serialVersionUID = -3304312411574666869LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::Component)))) items;
-  jboolean multipleMode;
-  jint rows;
-  JArray< jint > * selected;
-  jint visibleIndex;
-  ::java::awt::event::ItemListener * item_listeners;
-  ::java::awt::event::ActionListener * action_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_List__
diff --git a/libjava/java/awt/MediaTracker$MediaEntry.h b/libjava/java/awt/MediaTracker$MediaEntry.h
deleted file mode 100644
index a21715b59b9..00000000000
--- a/libjava/java/awt/MediaTracker$MediaEntry.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MediaTracker$MediaEntry__
-#define __java_awt_MediaTracker$MediaEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-        class MediaTracker;
-        class MediaTracker$MediaEntry;
-    }
-  }
-}
-
-class java::awt::MediaTracker$MediaEntry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MediaTracker$MediaEntry(::java::awt::MediaTracker *);
-public:
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::awt::Image * image;
-  ::java::awt::MediaTracker$MediaEntry * next;
-  jint status;
-  jint width;
-  jint height;
-  ::java::awt::MediaTracker * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MediaTracker$MediaEntry__
diff --git a/libjava/java/awt/MediaTracker.h b/libjava/java/awt/MediaTracker.h
deleted file mode 100644
index bc72868639d..00000000000
--- a/libjava/java/awt/MediaTracker.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MediaTracker__
-#define __java_awt_MediaTracker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Image;
-        class MediaTracker;
-        class MediaTracker$MediaEntry;
-    }
-  }
-}
-
-class java::awt::MediaTracker : public ::java::lang::Object
-{
-
-public:
-  MediaTracker(::java::awt::Component *);
-  virtual void addImage(::java::awt::Image *, jint);
-  virtual void addImage(::java::awt::Image *, jint, jint, jint);
-  virtual jboolean checkAll();
-  virtual jboolean checkAll(jboolean);
-  virtual jboolean isErrorAny();
-  virtual JArray< ::java::lang::Object * > * getErrorsAny();
-  virtual void waitForAll();
-  virtual jboolean waitForAll(jlong);
-  virtual jint statusAll(jboolean);
-  virtual jboolean checkID(jint);
-  virtual jboolean checkID(jint, jboolean);
-  virtual jboolean isErrorID(jint);
-  virtual JArray< ::java::lang::Object * > * getErrorsID(jint);
-  virtual void waitForID(jint);
-  virtual jboolean waitForID(jint, jlong);
-  virtual jint statusID(jint, jboolean);
-  virtual void removeImage(::java::awt::Image *);
-  virtual void removeImage(::java::awt::Image *, jint);
-  virtual void removeImage(::java::awt::Image *, jint, jint, jint);
-  static const jint LOADING = 1;
-  static const jint ABORTED = 2;
-  static const jint ERRORED = 4;
-  static const jint COMPLETE = 8;
-public: // actually package-private
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  ::java::awt::MediaTracker$MediaEntry * head;
-  static const jlong serialVersionUID = -483174189758638095LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MediaTracker__
diff --git a/libjava/java/awt/Menu$AccessibleAWTMenu.h b/libjava/java/awt/Menu$AccessibleAWTMenu.h
deleted file mode 100644
index 73c33a7b70a..00000000000
--- a/libjava/java/awt/Menu$AccessibleAWTMenu.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Menu$AccessibleAWTMenu__
-#define __java_awt_Menu$AccessibleAWTMenu__
-
-#pragma interface
-
-#include <java/awt/MenuItem$AccessibleAWTMenuItem.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class Menu$AccessibleAWTMenu;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Menu$AccessibleAWTMenu : public ::java::awt::MenuItem$AccessibleAWTMenuItem
-{
-
-public: // actually protected
-  Menu$AccessibleAWTMenu(::java::awt::Menu *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 5228160894980069094LL;
-public: // actually package-private
-  ::java::awt::Menu * __attribute__((aligned(__alignof__( ::java::awt::MenuItem$AccessibleAWTMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Menu$AccessibleAWTMenu__
diff --git a/libjava/java/awt/Menu.h b/libjava/java/awt/Menu.h
deleted file mode 100644
index 7d2ab26d27c..00000000000
--- a/libjava/java/awt/Menu.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Menu__
-#define __java_awt_Menu__
-
-#pragma interface
-
-#include <java/awt/MenuItem.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuComponent;
-        class MenuItem;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Menu : public ::java::awt::MenuItem
-{
-
-public:
-  Menu();
-  Menu(::java::lang::String *);
-  Menu(::java::lang::String *, jboolean);
-  virtual jboolean isTearOff();
-  virtual jint getItemCount();
-  virtual jint countItems();
-  virtual ::java::awt::MenuItem * getItem(jint);
-  virtual ::java::awt::MenuItem * add(::java::awt::MenuItem *);
-  virtual void add(::java::lang::String *);
-  virtual void insert(::java::awt::MenuItem *, jint);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void addSeparator();
-  virtual void insertSeparator(jint);
-  virtual void remove(jint);
-  virtual void remove(::java::awt::MenuComponent *);
-  virtual void removeAll();
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual ::java::lang::String * paramString();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_menu_number;
-  static const jlong serialVersionUID = -8809584163345499784LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::MenuItem)))) items;
-  jboolean tearOff;
-  jboolean isHelpMenu;
-  jint menuSerializedDataVersion;
-public: // actually package-private
-  static ::java::lang::String * separatorLabel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Menu__
diff --git a/libjava/java/awt/MenuBar$AccessibleAWTMenuBar.h b/libjava/java/awt/MenuBar$AccessibleAWTMenuBar.h
deleted file mode 100644
index 2f40500593f..00000000000
--- a/libjava/java/awt/MenuBar$AccessibleAWTMenuBar.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuBar$AccessibleAWTMenuBar__
-#define __java_awt_MenuBar$AccessibleAWTMenuBar__
-
-#pragma interface
-
-#include <java/awt/MenuComponent$AccessibleAWTMenuComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuBar;
-        class MenuBar$AccessibleAWTMenuBar;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::MenuBar$AccessibleAWTMenuBar : public ::java::awt::MenuComponent$AccessibleAWTMenuComponent
-{
-
-public: // actually protected
-  MenuBar$AccessibleAWTMenuBar(::java::awt::MenuBar *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -8577604491830083815LL;
-public: // actually package-private
-  ::java::awt::MenuBar * __attribute__((aligned(__alignof__( ::java::awt::MenuComponent$AccessibleAWTMenuComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuBar$AccessibleAWTMenuBar__
diff --git a/libjava/java/awt/MenuBar.h b/libjava/java/awt/MenuBar.h
deleted file mode 100644
index f9eded3de4e..00000000000
--- a/libjava/java/awt/MenuBar.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuBar__
-#define __java_awt_MenuBar__
-
-#pragma interface
-
-#include <java/awt/MenuComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuBar;
-        class MenuComponent;
-        class MenuItem;
-        class MenuShortcut;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::MenuBar : public ::java::awt::MenuComponent
-{
-
-public:
-  MenuBar();
-  virtual ::java::awt::Menu * getHelpMenu();
-  virtual void setHelpMenu(::java::awt::Menu *);
-  virtual ::java::awt::Menu * add(::java::awt::Menu *);
-  virtual void remove(jint);
-  virtual void remove(::java::awt::MenuComponent *);
-  virtual jint getMenuCount();
-  virtual jint countMenus();
-  virtual ::java::awt::Menu * getMenu(jint);
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual ::java::util::Enumeration * shortcuts();
-  virtual ::java::awt::MenuItem * getShortcutMenuItem(::java::awt::MenuShortcut *);
-  virtual void deleteShortcut(::java::awt::MenuShortcut *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = -4930327919388951260LL;
-  static jlong next_menubar_number;
-  ::java::awt::Menu * __attribute__((aligned(__alignof__( ::java::awt::MenuComponent)))) helpMenu;
-  ::java::util::Vector * menus;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuBar__
diff --git a/libjava/java/awt/MenuComponent$AccessibleAWTMenuComponent.h b/libjava/java/awt/MenuComponent$AccessibleAWTMenuComponent.h
deleted file mode 100644
index 05d724b702d..00000000000
--- a/libjava/java/awt/MenuComponent$AccessibleAWTMenuComponent.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuComponent$AccessibleAWTMenuComponent__
-#define __java_awt_MenuComponent$AccessibleAWTMenuComponent__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class MenuComponent;
-        class MenuComponent$AccessibleAWTMenuComponent;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleComponent;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::MenuComponent$AccessibleAWTMenuComponent : public ::javax::accessibility::AccessibleContext
-{
-
-public: // actually protected
-  MenuComponent$AccessibleAWTMenuComponent(::java::awt::MenuComponent *);
-public:
-  virtual void addAccessibleSelection(jint);
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void clearAccessibleSelection();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  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 ::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 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 requestFocus();
-  virtual void selectAllAccessibleSelection();
-  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:
-  static const jlong serialVersionUID = -4269533416223798698LL;
-public: // actually package-private
-  ::java::awt::MenuComponent * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuComponent$AccessibleAWTMenuComponent__
diff --git a/libjava/java/awt/MenuComponent.h b/libjava/java/awt/MenuComponent.h
deleted file mode 100644
index d47e7185368..00000000000
--- a/libjava/java/awt/MenuComponent.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuComponent__
-#define __java_awt_MenuComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Event;
-        class Font;
-        class MenuComponent;
-        class MenuContainer;
-        class Toolkit;
-      namespace event
-      {
-          class FocusListener;
-      }
-      namespace peer
-      {
-          class MenuComponentPeer;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::MenuComponent : public ::java::lang::Object
-{
-
-public:
-  MenuComponent();
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-public:
-  virtual void setName(::java::lang::String *);
-  virtual ::java::awt::MenuContainer * getParent();
-public: // actually package-private
-  virtual void setParent(::java::awt::MenuContainer *);
-public:
-  virtual ::java::awt::peer::MenuComponentPeer * getPeer();
-public: // actually package-private
-  virtual void setPeer(::java::awt::peer::MenuComponentPeer *);
-public:
-  virtual void removeNotify();
-public: // actually package-private
-  virtual ::java::awt::Toolkit * getToolkit();
-public: // actually protected
-  virtual ::java::lang::Object * getTreeLock();
-public: // actually package-private
-  virtual void setTreeLock(::java::lang::Object *);
-public:
-  virtual jboolean postEvent(::java::awt::Event *);
-  virtual void dispatchEvent(::java::awt::AWTEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -4536902356223894379LL;
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::lang::Object)))) font;
-  ::java::lang::String * name;
-public: // actually package-private
-  ::java::awt::MenuContainer * parent;
-  ::java::awt::peer::MenuComponentPeer * peer;
-private:
-  ::java::lang::Object * tree_lock;
-  static ::java::awt::Toolkit * toolkit;
-public: // actually package-private
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-private:
-  jboolean nameExplicitlySet;
-  jboolean newEventsOnly;
-public: // actually package-private
-  ::java::awt::event::FocusListener * focusListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuComponent__
diff --git a/libjava/java/awt/MenuContainer.h b/libjava/java/awt/MenuContainer.h
deleted file mode 100644
index 3f2a1cf9154..00000000000
--- a/libjava/java/awt/MenuContainer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuContainer__
-#define __java_awt_MenuContainer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Event;
-        class Font;
-        class MenuComponent;
-        class MenuContainer;
-    }
-  }
-}
-
-class java::awt::MenuContainer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual void remove(::java::awt::MenuComponent *) = 0;
-  virtual jboolean postEvent(::java::awt::Event *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_MenuContainer__
diff --git a/libjava/java/awt/MenuItem$AccessibleAWTMenuItem.h b/libjava/java/awt/MenuItem$AccessibleAWTMenuItem.h
deleted file mode 100644
index 5bc2638663a..00000000000
--- a/libjava/java/awt/MenuItem$AccessibleAWTMenuItem.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuItem$AccessibleAWTMenuItem__
-#define __java_awt_MenuItem$AccessibleAWTMenuItem__
-
-#pragma interface
-
-#include <java/awt/MenuComponent$AccessibleAWTMenuComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuItem;
-        class MenuItem$AccessibleAWTMenuItem;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleRole;
-        class AccessibleValue;
-    }
-  }
-}
-
-class java::awt::MenuItem$AccessibleAWTMenuItem : public ::java::awt::MenuComponent$AccessibleAWTMenuComponent
-{
-
-public: // actually protected
-  MenuItem$AccessibleAWTMenuItem(::java::awt::MenuItem *);
-public:
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  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 = -217847831945965825LL;
-public: // actually package-private
-  ::java::awt::MenuItem * __attribute__((aligned(__alignof__( ::java::awt::MenuComponent$AccessibleAWTMenuComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuItem$AccessibleAWTMenuItem__
diff --git a/libjava/java/awt/MenuItem.h b/libjava/java/awt/MenuItem.h
deleted file mode 100644
index 2b57ebf29d1..00000000000
--- a/libjava/java/awt/MenuItem.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuItem__
-#define __java_awt_MenuItem__
-
-#pragma interface
-
-#include <java/awt/MenuComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class MenuItem;
-        class MenuShortcut;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::MenuItem : public ::java::awt::MenuComponent
-{
-
-public:
-  MenuItem();
-  MenuItem(::java::lang::String *);
-  MenuItem(::java::lang::String *, ::java::awt::MenuShortcut *);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual void enable(jboolean);
-  virtual void enable();
-  virtual void disable();
-  virtual ::java::awt::MenuShortcut * getShortcut();
-  virtual void setShortcut(::java::awt::MenuShortcut *);
-  virtual void deleteShortcut();
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setActionCommand(::java::lang::String *);
-public: // actually protected
-  virtual void enableEvents(jlong);
-  virtual void disableEvents(jlong);
-public:
-  virtual void addNotify();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processActionEvent(::java::awt::event::ActionEvent *);
-public:
-  virtual ::java::lang::String * paramString();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_menuitem_number;
-  static const jlong serialVersionUID = -21757335363267194LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::MenuComponent)))) actionCommand;
-  jboolean enabled;
-  jlong eventMask;
-  ::java::lang::String * label;
-private:
-  ::java::awt::MenuShortcut * shortcut;
-  ::java::awt::event::ActionListener * action_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuItem__
diff --git a/libjava/java/awt/MenuShortcut.h b/libjava/java/awt/MenuShortcut.h
deleted file mode 100644
index 89ae7a8730f..00000000000
--- a/libjava/java/awt/MenuShortcut.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuShortcut__
-#define __java_awt_MenuShortcut__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuShortcut;
-    }
-  }
-}
-
-class java::awt::MenuShortcut : public ::java::lang::Object
-{
-
-public:
-  MenuShortcut(jint);
-  MenuShortcut(jint, jboolean);
-  virtual jint getKey();
-  virtual jboolean usesShiftModifier();
-  virtual jboolean equals(::java::awt::MenuShortcut *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual jint hashCode();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  void setKeyName(jint);
-  static const jlong serialVersionUID = 143448358473180225LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  jboolean usesShift;
-  ::java::lang::String * keyName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuShortcut__
diff --git a/libjava/java/awt/MouseInfo.h b/libjava/java/awt/MouseInfo.h
deleted file mode 100644
index 20414cb31d9..00000000000
--- a/libjava/java/awt/MouseInfo.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MouseInfo__
-#define __java_awt_MouseInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class MouseInfo;
-        class PointerInfo;
-      namespace peer
-      {
-          class MouseInfoPeer;
-      }
-    }
-  }
-}
-
-class java::awt::MouseInfo : public ::java::lang::Object
-{
-
-  MouseInfo();
-public:
-  static ::java::awt::PointerInfo * getPointerInfo();
-  static jint getNumberOfButtons();
-private:
-  static ::java::awt::peer::MouseInfoPeer * peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MouseInfo__
diff --git a/libjava/java/awt/PageAttributes$ColorType.h b/libjava/java/awt/PageAttributes$ColorType.h
deleted file mode 100644
index ae67841f636..00000000000
--- a/libjava/java/awt/PageAttributes$ColorType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$ColorType__
-#define __java_awt_PageAttributes$ColorType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$ColorType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$ColorType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$ColorType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$ColorType * COLOR;
-  static ::java::awt::PageAttributes$ColorType * MONOCHROME;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$ColorType__
diff --git a/libjava/java/awt/PageAttributes$MediaType.h b/libjava/java/awt/PageAttributes$MediaType.h
deleted file mode 100644
index c085d0aa7df..00000000000
--- a/libjava/java/awt/PageAttributes$MediaType.h
+++ /dev/null
@@ -1,179 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$MediaType__
-#define __java_awt_PageAttributes$MediaType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$MediaType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$MediaType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$MediaType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$MediaType * ISO_4A0;
-  static ::java::awt::PageAttributes$MediaType * ISO_2A0;
-  static ::java::awt::PageAttributes$MediaType * ISO_A0;
-  static ::java::awt::PageAttributes$MediaType * ISO_A1;
-  static ::java::awt::PageAttributes$MediaType * ISO_A2;
-  static ::java::awt::PageAttributes$MediaType * ISO_A3;
-  static ::java::awt::PageAttributes$MediaType * ISO_A4;
-  static ::java::awt::PageAttributes$MediaType * ISO_A5;
-  static ::java::awt::PageAttributes$MediaType * ISO_A6;
-  static ::java::awt::PageAttributes$MediaType * ISO_A7;
-  static ::java::awt::PageAttributes$MediaType * ISO_A8;
-  static ::java::awt::PageAttributes$MediaType * ISO_A9;
-  static ::java::awt::PageAttributes$MediaType * ISO_A10;
-  static ::java::awt::PageAttributes$MediaType * ISO_B0;
-  static ::java::awt::PageAttributes$MediaType * ISO_B1;
-  static ::java::awt::PageAttributes$MediaType * ISO_B2;
-  static ::java::awt::PageAttributes$MediaType * ISO_B3;
-  static ::java::awt::PageAttributes$MediaType * ISO_B4;
-  static ::java::awt::PageAttributes$MediaType * ISO_B5;
-  static ::java::awt::PageAttributes$MediaType * ISO_B6;
-  static ::java::awt::PageAttributes$MediaType * ISO_B7;
-  static ::java::awt::PageAttributes$MediaType * ISO_B8;
-  static ::java::awt::PageAttributes$MediaType * ISO_B9;
-  static ::java::awt::PageAttributes$MediaType * ISO_B10;
-  static ::java::awt::PageAttributes$MediaType * JIS_B0;
-  static ::java::awt::PageAttributes$MediaType * JIS_B1;
-  static ::java::awt::PageAttributes$MediaType * JIS_B2;
-  static ::java::awt::PageAttributes$MediaType * JIS_B3;
-  static ::java::awt::PageAttributes$MediaType * JIS_B4;
-  static ::java::awt::PageAttributes$MediaType * JIS_B5;
-  static ::java::awt::PageAttributes$MediaType * JIS_B6;
-  static ::java::awt::PageAttributes$MediaType * JIS_B7;
-  static ::java::awt::PageAttributes$MediaType * JIS_B8;
-  static ::java::awt::PageAttributes$MediaType * JIS_B9;
-  static ::java::awt::PageAttributes$MediaType * JIS_B10;
-  static ::java::awt::PageAttributes$MediaType * ISO_C0;
-  static ::java::awt::PageAttributes$MediaType * ISO_C1;
-  static ::java::awt::PageAttributes$MediaType * ISO_C2;
-  static ::java::awt::PageAttributes$MediaType * ISO_C3;
-  static ::java::awt::PageAttributes$MediaType * ISO_C4;
-  static ::java::awt::PageAttributes$MediaType * ISO_C5;
-  static ::java::awt::PageAttributes$MediaType * ISO_C6;
-  static ::java::awt::PageAttributes$MediaType * ISO_C7;
-  static ::java::awt::PageAttributes$MediaType * ISO_C8;
-  static ::java::awt::PageAttributes$MediaType * ISO_C9;
-  static ::java::awt::PageAttributes$MediaType * ISO_C10;
-  static ::java::awt::PageAttributes$MediaType * ISO_DESIGNATED_LONG;
-  static ::java::awt::PageAttributes$MediaType * EXECUTIVE;
-  static ::java::awt::PageAttributes$MediaType * FOLIO;
-  static ::java::awt::PageAttributes$MediaType * INVOICE;
-  static ::java::awt::PageAttributes$MediaType * LEDGER;
-  static ::java::awt::PageAttributes$MediaType * NA_LETTER;
-  static ::java::awt::PageAttributes$MediaType * NA_LEGAL;
-  static ::java::awt::PageAttributes$MediaType * QUARTO;
-  static ::java::awt::PageAttributes$MediaType * A;
-  static ::java::awt::PageAttributes$MediaType * B;
-  static ::java::awt::PageAttributes$MediaType * C;
-  static ::java::awt::PageAttributes$MediaType * D;
-  static ::java::awt::PageAttributes$MediaType * E;
-  static ::java::awt::PageAttributes$MediaType * NA_10X15_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_10X14_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_10X13_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_9X12_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_9X11_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_7X9_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_6X9_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_9_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_10_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_11_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_12_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_14_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * INVITE_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * ITALY_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * MONARCH_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * PERSONAL_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * A0;
-  static ::java::awt::PageAttributes$MediaType * A1;
-  static ::java::awt::PageAttributes$MediaType * A2;
-  static ::java::awt::PageAttributes$MediaType * A3;
-  static ::java::awt::PageAttributes$MediaType * A4;
-  static ::java::awt::PageAttributes$MediaType * A5;
-  static ::java::awt::PageAttributes$MediaType * A6;
-  static ::java::awt::PageAttributes$MediaType * A7;
-  static ::java::awt::PageAttributes$MediaType * A8;
-  static ::java::awt::PageAttributes$MediaType * A9;
-  static ::java::awt::PageAttributes$MediaType * A10;
-  static ::java::awt::PageAttributes$MediaType * B0;
-  static ::java::awt::PageAttributes$MediaType * B1;
-  static ::java::awt::PageAttributes$MediaType * B2;
-  static ::java::awt::PageAttributes$MediaType * B3;
-  static ::java::awt::PageAttributes$MediaType * B4;
-  static ::java::awt::PageAttributes$MediaType * ISO_B4_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * B5;
-  static ::java::awt::PageAttributes$MediaType * ISO_B5_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * B6;
-  static ::java::awt::PageAttributes$MediaType * B7;
-  static ::java::awt::PageAttributes$MediaType * B8;
-  static ::java::awt::PageAttributes$MediaType * B9;
-  static ::java::awt::PageAttributes$MediaType * B10;
-  static ::java::awt::PageAttributes$MediaType * C0;
-  static ::java::awt::PageAttributes$MediaType * ISO_C0_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C1;
-  static ::java::awt::PageAttributes$MediaType * ISO_C1_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C2;
-  static ::java::awt::PageAttributes$MediaType * ISO_C2_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C3;
-  static ::java::awt::PageAttributes$MediaType * ISO_C3_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C4;
-  static ::java::awt::PageAttributes$MediaType * ISO_C4_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C5;
-  static ::java::awt::PageAttributes$MediaType * ISO_C5_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C6;
-  static ::java::awt::PageAttributes$MediaType * ISO_C6_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C7;
-  static ::java::awt::PageAttributes$MediaType * ISO_C7_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C8;
-  static ::java::awt::PageAttributes$MediaType * ISO_C8_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C9;
-  static ::java::awt::PageAttributes$MediaType * ISO_C9_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C10;
-  static ::java::awt::PageAttributes$MediaType * ISO_C10_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * ISO_DESIGNATED_LONG_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * STATEMENT;
-  static ::java::awt::PageAttributes$MediaType * TABLOID;
-  static ::java::awt::PageAttributes$MediaType * LETTER;
-  static ::java::awt::PageAttributes$MediaType * NOTE;
-  static ::java::awt::PageAttributes$MediaType * LEGAL;
-  static ::java::awt::PageAttributes$MediaType * ENV_10X15;
-  static ::java::awt::PageAttributes$MediaType * ENV_10X14;
-  static ::java::awt::PageAttributes$MediaType * ENV_10X13;
-  static ::java::awt::PageAttributes$MediaType * ENV_9X12;
-  static ::java::awt::PageAttributes$MediaType * ENV_9X11;
-  static ::java::awt::PageAttributes$MediaType * ENV_7X9;
-  static ::java::awt::PageAttributes$MediaType * ENV_6X9;
-  static ::java::awt::PageAttributes$MediaType * ENV_9;
-  static ::java::awt::PageAttributes$MediaType * ENV_10;
-  static ::java::awt::PageAttributes$MediaType * ENV_11;
-  static ::java::awt::PageAttributes$MediaType * ENV_12;
-  static ::java::awt::PageAttributes$MediaType * ENV_14;
-  static ::java::awt::PageAttributes$MediaType * ENV_INVITE;
-  static ::java::awt::PageAttributes$MediaType * ENV_ITALY;
-  static ::java::awt::PageAttributes$MediaType * ENV_MONARCH;
-  static ::java::awt::PageAttributes$MediaType * ENV_PERSONAL;
-  static ::java::awt::PageAttributes$MediaType * INVITE;
-  static ::java::awt::PageAttributes$MediaType * ITALY;
-  static ::java::awt::PageAttributes$MediaType * MONARCH;
-  static ::java::awt::PageAttributes$MediaType * PERSONAL;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$MediaType__
diff --git a/libjava/java/awt/PageAttributes$OrientationRequestedType.h b/libjava/java/awt/PageAttributes$OrientationRequestedType.h
deleted file mode 100644
index 79e1602d3bd..00000000000
--- a/libjava/java/awt/PageAttributes$OrientationRequestedType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$OrientationRequestedType__
-#define __java_awt_PageAttributes$OrientationRequestedType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$OrientationRequestedType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$OrientationRequestedType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$OrientationRequestedType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$OrientationRequestedType * PORTRAIT;
-  static ::java::awt::PageAttributes$OrientationRequestedType * LANDSCAPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$OrientationRequestedType__
diff --git a/libjava/java/awt/PageAttributes$OriginType.h b/libjava/java/awt/PageAttributes$OriginType.h
deleted file mode 100644
index 16e04f86690..00000000000
--- a/libjava/java/awt/PageAttributes$OriginType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$OriginType__
-#define __java_awt_PageAttributes$OriginType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$OriginType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$OriginType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$OriginType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$OriginType * PHYSICAL;
-  static ::java::awt::PageAttributes$OriginType * PRINTABLE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$OriginType__
diff --git a/libjava/java/awt/PageAttributes$PrintQualityType.h b/libjava/java/awt/PageAttributes$PrintQualityType.h
deleted file mode 100644
index 3f2b68cab38..00000000000
--- a/libjava/java/awt/PageAttributes$PrintQualityType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$PrintQualityType__
-#define __java_awt_PageAttributes$PrintQualityType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$PrintQualityType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$PrintQualityType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$PrintQualityType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$PrintQualityType * HIGH;
-  static ::java::awt::PageAttributes$PrintQualityType * NORMAL;
-  static ::java::awt::PageAttributes$PrintQualityType * DRAFT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$PrintQualityType__
diff --git a/libjava/java/awt/PageAttributes.h b/libjava/java/awt/PageAttributes.h
deleted file mode 100644
index 7ed2f7a42e3..00000000000
--- a/libjava/java/awt/PageAttributes.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes__
-#define __java_awt_PageAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes;
-        class PageAttributes$ColorType;
-        class PageAttributes$MediaType;
-        class PageAttributes$OrientationRequestedType;
-        class PageAttributes$OriginType;
-        class PageAttributes$PrintQualityType;
-    }
-  }
-}
-
-class java::awt::PageAttributes : public ::java::lang::Object
-{
-
-public:
-  PageAttributes();
-  PageAttributes(::java::awt::PageAttributes *);
-  PageAttributes(::java::awt::PageAttributes$ColorType *, ::java::awt::PageAttributes$MediaType *, ::java::awt::PageAttributes$OrientationRequestedType *, ::java::awt::PageAttributes$OriginType *, ::java::awt::PageAttributes$PrintQualityType *, JArray< jint > *);
-  ::java::lang::Object * clone();
-  void set(::java::awt::PageAttributes *);
-  ::java::awt::PageAttributes$ColorType * getColor();
-  void setColor(::java::awt::PageAttributes$ColorType *);
-  ::java::awt::PageAttributes$MediaType * getMedia();
-  void setMedia(::java::awt::PageAttributes$MediaType *);
-  void setMediaToDefault();
-  ::java::awt::PageAttributes$OrientationRequestedType * getOrientationRequested();
-  void setOrientationRequested(::java::awt::PageAttributes$OrientationRequestedType *);
-  void setOrientationRequested(jint);
-  void setOrientationRequestedToDefault();
-  ::java::awt::PageAttributes$OriginType * getOrigin();
-  void setOrigin(::java::awt::PageAttributes$OriginType *);
-  ::java::awt::PageAttributes$PrintQualityType * getPrintQuality();
-  void setPrintQuality(::java::awt::PageAttributes$PrintQualityType *);
-  void setPrintQuality(jint);
-  void setPrintQualityToDefault();
-  JArray< jint > * getPrinterResolution();
-  void setPrinterResolution(JArray< jint > *);
-  void setPrinterResolution(jint);
-  void setPrinterResolutionToDefault();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::awt::PageAttributes$ColorType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) color;
-  ::java::awt::PageAttributes$MediaType * media;
-  ::java::awt::PageAttributes$OrientationRequestedType * orientation;
-  ::java::awt::PageAttributes$OriginType * origin;
-  ::java::awt::PageAttributes$PrintQualityType * quality;
-  jint resolutionX;
-  jint resolutionY;
-  jint resolutionScale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes__
diff --git a/libjava/java/awt/Paint.h b/libjava/java/awt/Paint.h
deleted file mode 100644
index 85f7c9fcec1..00000000000
--- a/libjava/java/awt/Paint.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Paint__
-#define __java_awt_Paint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Paint;
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::Paint : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *) = 0;
-  virtual jint getTransparency() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Paint__
diff --git a/libjava/java/awt/PaintContext.h b/libjava/java/awt/PaintContext.h
deleted file mode 100644
index 7658a30e476..00000000000
--- a/libjava/java/awt/PaintContext.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PaintContext__
-#define __java_awt_PaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PaintContext;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-      }
-    }
-  }
-}
-
-class java::awt::PaintContext : public ::java::lang::Object
-{
-
-public:
-  virtual void dispose() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_PaintContext__
diff --git a/libjava/java/awt/Panel$AccessibleAWTPanel.h b/libjava/java/awt/Panel$AccessibleAWTPanel.h
deleted file mode 100644
index 386cf0a2b4e..00000000000
--- a/libjava/java/awt/Panel$AccessibleAWTPanel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Panel$AccessibleAWTPanel__
-#define __java_awt_Panel$AccessibleAWTPanel__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Panel;
-        class Panel$AccessibleAWTPanel;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Panel$AccessibleAWTPanel : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  Panel$AccessibleAWTPanel(::java::awt::Panel *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -6409552226660031050LL;
-public: // actually package-private
-  ::java::awt::Panel * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Panel$AccessibleAWTPanel__
diff --git a/libjava/java/awt/Panel.h b/libjava/java/awt/Panel.h
deleted file mode 100644
index 23a788e4be2..00000000000
--- a/libjava/java/awt/Panel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Panel__
-#define __java_awt_Panel__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class LayoutManager;
-        class Panel;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Panel : public ::java::awt::Container
-{
-
-public:
-  Panel();
-  Panel(::java::awt::LayoutManager *);
-  virtual void addNotify();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = -2728009084054400034LL;
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Container)))) context;
-  jboolean initialSystemUpdateDone;
-  jboolean initialUpdateConsumed;
-  static jlong next_panel_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Panel__
diff --git a/libjava/java/awt/Point.h b/libjava/java/awt/Point.h
deleted file mode 100644
index a161a00cdf5..00000000000
--- a/libjava/java/awt/Point.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Point__
-#define __java_awt_Point__
-
-#pragma interface
-
-#include <java/awt/geom/Point2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-  }
-}
-
-class java::awt::Point : public ::java::awt::geom::Point2D
-{
-
-public:
-  Point();
-  Point(::java::awt::Point *);
-  Point(jint, jint);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setLocation(jint, jint);
-  virtual void setLocation(jdouble, jdouble);
-  virtual void move(jint, jint);
-  virtual void translate(jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5276940640259749850LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::awt::geom::Point2D)))) x;
-  jint y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Point__
diff --git a/libjava/java/awt/PointerInfo.h b/libjava/java/awt/PointerInfo.h
deleted file mode 100644
index fc149bbf014..00000000000
--- a/libjava/java/awt/PointerInfo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PointerInfo__
-#define __java_awt_PointerInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsDevice;
-        class Point;
-        class PointerInfo;
-    }
-  }
-}
-
-class java::awt::PointerInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PointerInfo(::java::awt::GraphicsDevice *, ::java::awt::Point *);
-public:
-  virtual ::java::awt::GraphicsDevice * getDevice();
-  virtual ::java::awt::Point * getLocation();
-private:
-  ::java::awt::GraphicsDevice * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gd;
-  ::java::awt::Point * p;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PointerInfo__
diff --git a/libjava/java/awt/Polygon$1.h b/libjava/java/awt/Polygon$1.h
deleted file mode 100644
index 1073b69328e..00000000000
--- a/libjava/java/awt/Polygon$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Polygon$1__
-#define __java_awt_Polygon$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Polygon;
-        class Polygon$1;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class java::awt::Polygon$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Polygon$1(::java::awt::Polygon *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) vertex;
-public: // actually package-private
-  ::java::awt::Polygon * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$transform;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Polygon$1__
diff --git a/libjava/java/awt/Polygon.h b/libjava/java/awt/Polygon.h
deleted file mode 100644
index e692f132e96..00000000000
--- a/libjava/java/awt/Polygon.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Polygon__
-#define __java_awt_Polygon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Polygon;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::Polygon : public ::java::lang::Object
-{
-
-public:
-  Polygon();
-  Polygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void reset();
-  virtual void invalidate();
-  virtual void translate(jint, jint);
-  virtual void addPoint(jint, jint);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Rectangle * getBoundingBox();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual jboolean contains(jint, jint);
-  virtual jboolean inside(jint, jint);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-private:
-  jint evaluateCrossings(jdouble, jdouble, jboolean, jdouble);
-  static const jlong serialVersionUID = -6460061437900069969LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) npoints;
-  JArray< jint > * xpoints;
-  JArray< jint > * ypoints;
-public: // actually protected
-  ::java::awt::Rectangle * bounds;
-private:
-  static jdouble BIG_VALUE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Polygon__
diff --git a/libjava/java/awt/PopupMenu$AccessibleAWTPopupMenu.h b/libjava/java/awt/PopupMenu$AccessibleAWTPopupMenu.h
deleted file mode 100644
index f28ed4cac80..00000000000
--- a/libjava/java/awt/PopupMenu$AccessibleAWTPopupMenu.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PopupMenu$AccessibleAWTPopupMenu__
-#define __java_awt_PopupMenu$AccessibleAWTPopupMenu__
-
-#pragma interface
-
-#include <java/awt/Menu$AccessibleAWTMenu.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PopupMenu;
-        class PopupMenu$AccessibleAWTPopupMenu;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::PopupMenu$AccessibleAWTPopupMenu : public ::java::awt::Menu$AccessibleAWTMenu
-{
-
-public: // actually protected
-  PopupMenu$AccessibleAWTPopupMenu(::java::awt::PopupMenu *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -4282044795947239955LL;
-public: // actually package-private
-  ::java::awt::PopupMenu * __attribute__((aligned(__alignof__( ::java::awt::Menu$AccessibleAWTMenu)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PopupMenu$AccessibleAWTPopupMenu__
diff --git a/libjava/java/awt/PopupMenu.h b/libjava/java/awt/PopupMenu.h
deleted file mode 100644
index 855809bb0f8..00000000000
--- a/libjava/java/awt/PopupMenu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PopupMenu__
-#define __java_awt_PopupMenu__
-
-#pragma interface
-
-#include <java/awt/Menu.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class PopupMenu;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::PopupMenu : public ::java::awt::Menu
-{
-
-public:
-  PopupMenu();
-  PopupMenu(::java::lang::String *);
-  virtual void addNotify();
-  virtual void show(::java::awt::Component *, jint, jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_popup_number;
-  static const jlong serialVersionUID = -4620452533522760060LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PopupMenu__
diff --git a/libjava/java/awt/PrintGraphics.h b/libjava/java/awt/PrintGraphics.h
deleted file mode 100644
index 7027cb6b743..00000000000
--- a/libjava/java/awt/PrintGraphics.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PrintGraphics__
-#define __java_awt_PrintGraphics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PrintGraphics;
-        class PrintJob;
-    }
-  }
-}
-
-class java::awt::PrintGraphics : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::PrintJob * getPrintJob() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_PrintGraphics__
diff --git a/libjava/java/awt/PrintJob.h b/libjava/java/awt/PrintJob.h
deleted file mode 100644
index 66c98e3e31b..00000000000
--- a/libjava/java/awt/PrintJob.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PrintJob__
-#define __java_awt_PrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class PrintJob;
-    }
-  }
-}
-
-class java::awt::PrintJob : public ::java::lang::Object
-{
-
-public:
-  PrintJob();
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Dimension * getPageDimension() = 0;
-  virtual jint getPageResolution() = 0;
-  virtual jboolean lastPageFirst() = 0;
-  virtual void end() = 0;
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PrintJob__
diff --git a/libjava/java/awt/Rectangle.h b/libjava/java/awt/Rectangle.h
deleted file mode 100644
index 6a098adb513..00000000000
--- a/libjava/java/awt/Rectangle.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Rectangle__
-#define __java_awt_Rectangle__
-
-#pragma interface
-
-#include <java/awt/geom/Rectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Point;
-        class Rectangle;
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::Rectangle : public ::java::awt::geom::Rectangle2D
-{
-
-public:
-  Rectangle();
-  Rectangle(::java::awt::Rectangle *);
-  Rectangle(jint, jint, jint, jint);
-  Rectangle(jint, jint);
-  Rectangle(::java::awt::Point *, ::java::awt::Dimension *);
-  Rectangle(::java::awt::Point *);
-  Rectangle(::java::awt::Dimension *);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setRect(jdouble, jdouble, jdouble, jdouble);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setLocation(jint, jint);
-  virtual void move(jint, jint);
-  virtual void translate(jint, jint);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setSize(jint, jint);
-  virtual void resize(jint, jint);
-  virtual jboolean contains(::java::awt::Point *);
-  virtual jboolean contains(jint, jint);
-  virtual jboolean contains(::java::awt::Rectangle *);
-  virtual jboolean contains(jint, jint, jint, jint);
-  virtual jboolean inside(jint, jint);
-  virtual jboolean intersects(::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * intersection(::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * union$(::java::awt::Rectangle *);
-  virtual void add(jint, jint);
-  virtual void add(::java::awt::Point *);
-  virtual void add(::java::awt::Rectangle *);
-  virtual void grow(jint, jint);
-  virtual jboolean isEmpty();
-  virtual jint outcode(jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -4345857070255674764LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::awt::geom::Rectangle2D)))) x;
-  jint y;
-  jint width;
-  jint height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Rectangle__
diff --git a/libjava/java/awt/RenderingHints$Key.h b/libjava/java/awt/RenderingHints$Key.h
deleted file mode 100644
index 7f4c9724cfd..00000000000
--- a/libjava/java/awt/RenderingHints$Key.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_RenderingHints$Key__
-#define __java_awt_RenderingHints$Key__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints$Key;
-    }
-  }
-}
-
-class java::awt::RenderingHints$Key : public ::java::lang::Object
-{
-
-public: // actually protected
-  RenderingHints$Key(jint);
-public:
-  virtual jboolean isCompatibleValue(::java::lang::Object *) = 0;
-public: // actually protected
-  virtual jint intKey();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_RenderingHints$Key__
diff --git a/libjava/java/awt/RenderingHints$KeyImpl.h b/libjava/java/awt/RenderingHints$KeyImpl.h
deleted file mode 100644
index d81b7b9c1bc..00000000000
--- a/libjava/java/awt/RenderingHints$KeyImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_RenderingHints$KeyImpl__
-#define __java_awt_RenderingHints$KeyImpl__
-
-#pragma interface
-
-#include <java/awt/RenderingHints$Key.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints$KeyImpl;
-    }
-  }
-}
-
-class java::awt::RenderingHints$KeyImpl : public ::java::awt::RenderingHints$Key
-{
-
-public: // actually package-private
-  RenderingHints$KeyImpl(jint, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  jboolean isCompatibleValue(::java::lang::Object *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::RenderingHints$Key)))) description;
-  ::java::lang::Object * v1;
-  ::java::lang::Object * v2;
-  ::java::lang::Object * v3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_RenderingHints$KeyImpl__
diff --git a/libjava/java/awt/RenderingHints.h b/libjava/java/awt/RenderingHints.h
deleted file mode 100644
index 6ceee185348..00000000000
--- a/libjava/java/awt/RenderingHints.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_RenderingHints__
-#define __java_awt_RenderingHints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-        class RenderingHints$Key;
-    }
-  }
-}
-
-class java::awt::RenderingHints : public ::java::lang::Object
-{
-
-public:
-  RenderingHints(::java::util::Map *);
-  RenderingHints(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void add(::java::awt::RenderingHints *);
-  virtual void clear();
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::util::Set * keySet();
-  virtual ::java::util::Collection * values();
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hintMap;
-public:
-  static ::java::awt::RenderingHints$Key * KEY_ANTIALIASING;
-  static ::java::lang::Object * VALUE_ANTIALIAS_ON;
-  static ::java::lang::Object * VALUE_ANTIALIAS_OFF;
-  static ::java::lang::Object * VALUE_ANTIALIAS_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_RENDERING;
-  static ::java::lang::Object * VALUE_RENDER_SPEED;
-  static ::java::lang::Object * VALUE_RENDER_QUALITY;
-  static ::java::lang::Object * VALUE_RENDER_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_DITHERING;
-  static ::java::lang::Object * VALUE_DITHER_DISABLE;
-  static ::java::lang::Object * VALUE_DITHER_ENABLE;
-  static ::java::lang::Object * VALUE_DITHER_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_TEXT_ANTIALIASING;
-  static ::java::lang::Object * VALUE_TEXT_ANTIALIAS_ON;
-  static ::java::lang::Object * VALUE_TEXT_ANTIALIAS_OFF;
-  static ::java::lang::Object * VALUE_TEXT_ANTIALIAS_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_FRACTIONALMETRICS;
-  static ::java::lang::Object * VALUE_FRACTIONALMETRICS_OFF;
-  static ::java::lang::Object * VALUE_FRACTIONALMETRICS_ON;
-  static ::java::lang::Object * VALUE_FRACTIONALMETRICS_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_INTERPOLATION;
-  static ::java::lang::Object * VALUE_INTERPOLATION_NEAREST_NEIGHBOR;
-  static ::java::lang::Object * VALUE_INTERPOLATION_BILINEAR;
-  static ::java::lang::Object * VALUE_INTERPOLATION_BICUBIC;
-  static ::java::awt::RenderingHints$Key * KEY_ALPHA_INTERPOLATION;
-  static ::java::lang::Object * VALUE_ALPHA_INTERPOLATION_SPEED;
-  static ::java::lang::Object * VALUE_ALPHA_INTERPOLATION_QUALITY;
-  static ::java::lang::Object * VALUE_ALPHA_INTERPOLATION_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_COLOR_RENDERING;
-  static ::java::lang::Object * VALUE_COLOR_RENDER_SPEED;
-  static ::java::lang::Object * VALUE_COLOR_RENDER_QUALITY;
-  static ::java::lang::Object * VALUE_COLOR_RENDER_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_STROKE_CONTROL;
-  static ::java::lang::Object * VALUE_STROKE_DEFAULT;
-  static ::java::lang::Object * VALUE_STROKE_NORMALIZE;
-  static ::java::lang::Object * VALUE_STROKE_PURE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_RenderingHints__
diff --git a/libjava/java/awt/Robot$1.h b/libjava/java/awt/Robot$1.h
deleted file mode 100644
index 2fe884ab751..00000000000
--- a/libjava/java/awt/Robot$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Robot$1__
-#define __java_awt_Robot$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Robot;
-        class Robot$1;
-    }
-  }
-}
-
-class java::awt::Robot$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Robot$1(::java::awt::Robot *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::java::awt::Robot * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Robot$1__
diff --git a/libjava/java/awt/Robot.h b/libjava/java/awt/Robot.h
deleted file mode 100644
index d283f7e97e7..00000000000
--- a/libjava/java/awt/Robot.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Robot__
-#define __java_awt_Robot__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class GraphicsDevice;
-        class Rectangle;
-        class Robot;
-      namespace image
-      {
-          class BufferedImage;
-      }
-      namespace peer
-      {
-          class RobotPeer;
-      }
-    }
-  }
-}
-
-class java::awt::Robot : public ::java::lang::Object
-{
-
-public:
-  Robot();
-  Robot(::java::awt::GraphicsDevice *);
-  virtual void mouseMove(jint, jint);
-  virtual void mousePress(jint);
-  virtual void mouseRelease(jint);
-  virtual void mouseWheel(jint);
-  virtual void keyPress(jint);
-  virtual void keyRelease(jint);
-  virtual ::java::awt::Color * getPixelColor(jint, jint);
-  virtual ::java::awt::image::BufferedImage * createScreenCapture(::java::awt::Rectangle *);
-  virtual jboolean isAutoWaitForIdle();
-  virtual void setAutoWaitForIdle(jboolean);
-  virtual jint getAutoDelay();
-  virtual void setAutoDelay(jint);
-  virtual void delay(jint);
-  virtual void waitForIdle();
-  virtual ::java::lang::String * toString();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitForIdle__;
-  jint autoDelay;
-  ::java::awt::peer::RobotPeer * peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Robot__
diff --git a/libjava/java/awt/ScrollPane$AccessibleAWTScrollPane.h b/libjava/java/awt/ScrollPane$AccessibleAWTScrollPane.h
deleted file mode 100644
index dd103cde337..00000000000
--- a/libjava/java/awt/ScrollPane$AccessibleAWTScrollPane.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ScrollPane$AccessibleAWTScrollPane__
-#define __java_awt_ScrollPane$AccessibleAWTScrollPane__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ScrollPane;
-        class ScrollPane$AccessibleAWTScrollPane;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::ScrollPane$AccessibleAWTScrollPane : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  ScrollPane$AccessibleAWTScrollPane(::java::awt::ScrollPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 6100703663886637LL;
-public: // actually package-private
-  ::java::awt::ScrollPane * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ScrollPane$AccessibleAWTScrollPane__
diff --git a/libjava/java/awt/ScrollPane.h b/libjava/java/awt/ScrollPane.h
deleted file mode 100644
index 30110cf7e78..00000000000
--- a/libjava/java/awt/ScrollPane.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ScrollPane__
-#define __java_awt_ScrollPane__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-        class Component;
-        class Dimension;
-        class Graphics;
-        class LayoutManager;
-        class Point;
-        class ScrollPane;
-        class ScrollPaneAdjustable;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::ScrollPane : public ::java::awt::Container
-{
-
-public:
-  ScrollPane();
-  ScrollPane(jint);
-  virtual jint getScrollbarDisplayPolicy();
-  virtual ::java::awt::Adjustable * getHAdjustable();
-  virtual ::java::awt::Adjustable * getVAdjustable();
-  virtual ::java::awt::Dimension * getViewportSize();
-  virtual jint getHScrollbarHeight();
-  virtual jint getVScrollbarWidth();
-  virtual ::java::awt::Point * getScrollPosition();
-  virtual void setScrollPosition(::java::awt::Point *);
-  virtual void setScrollPosition(jint, jint);
-  virtual void addNotify();
-  virtual void removeNotify();
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void doLayout();
-  virtual void layout();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void printComponents(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-private:
-  ::java::lang::String * getScrollbarDisplayPolicyString();
-  ::java::lang::String * getIsValidString();
-public: // actually protected
-  virtual jboolean eventTypeEnabled(jint);
-public:
-  virtual jboolean isWheelScrollingEnabled();
-  virtual void setWheelScrollingEnabled(jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  static const jint SCROLLBARS_AS_NEEDED = 0;
-  static const jint SCROLLBARS_ALWAYS = 1;
-  static const jint SCROLLBARS_NEVER = 2;
-private:
-  static jlong next_scrollpane_number;
-  static const jlong serialVersionUID = 7956609840827222915LL;
-  ::java::awt::ScrollPaneAdjustable * __attribute__((aligned(__alignof__( ::java::awt::Container)))) hAdjustable;
-  ::java::awt::ScrollPaneAdjustable * vAdjustable;
-  jint scrollbarDisplayPolicy;
-  ::java::awt::Point * scrollPosition;
-  jboolean wheelScrollingEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ScrollPane__
diff --git a/libjava/java/awt/ScrollPaneAdjustable.h b/libjava/java/awt/ScrollPaneAdjustable.h
deleted file mode 100644
index a07d48c0c86..00000000000
--- a/libjava/java/awt/ScrollPaneAdjustable.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ScrollPaneAdjustable__
-#define __java_awt_ScrollPaneAdjustable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ScrollPane;
-        class ScrollPaneAdjustable;
-      namespace event
-      {
-          class AdjustmentListener;
-      }
-    }
-  }
-}
-
-class java::awt::ScrollPaneAdjustable : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScrollPaneAdjustable(::java::awt::ScrollPane *, jint);
-  ScrollPaneAdjustable(::java::awt::ScrollPane *, jint, jint, jint, jint, jint, jint, jint);
-public:
-  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual JArray< ::java::awt::event::AdjustmentListener * > * getAdjustmentListeners();
-  virtual jint getBlockIncrement();
-  virtual jint getMaximum();
-  virtual jint getMinimum();
-  virtual jint getOrientation();
-  virtual jint getUnitIncrement();
-  virtual jint getValue();
-  virtual jint getVisibleAmount();
-  virtual void setBlockIncrement(jint);
-  virtual void setMaximum(jint);
-  virtual void setMinimum(jint);
-  virtual void setUnitIncrement(jint);
-  virtual void setValue(jint);
-  virtual void setVisibleAmount(jint);
-  virtual ::java::lang::String * paramString();
-private:
-  ::java::lang::String * paramStringHelper();
-public:
-  virtual ::java::lang::String * toString();
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-private:
-  static const jlong serialVersionUID = -3359745691033257079LL;
-public: // actually package-private
-  ::java::awt::ScrollPane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sp;
-  jint orientation;
-  jint value;
-  jint minimum;
-  jint maximum;
-  jint visibleAmount;
-  jint unitIncrement;
-  jint blockIncrement;
-  ::java::awt::event::AdjustmentListener * adjustmentListener;
-private:
-  jboolean valueIsAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ScrollPaneAdjustable__
diff --git a/libjava/java/awt/Scrollbar$AccessibleAWTScrollBar.h b/libjava/java/awt/Scrollbar$AccessibleAWTScrollBar.h
deleted file mode 100644
index 1549a6a24cd..00000000000
--- a/libjava/java/awt/Scrollbar$AccessibleAWTScrollBar.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Scrollbar$AccessibleAWTScrollBar__
-#define __java_awt_Scrollbar$AccessibleAWTScrollBar__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Scrollbar;
-        class Scrollbar$AccessibleAWTScrollBar;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-  }
-}
-
-class java::awt::Scrollbar$AccessibleAWTScrollBar : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Scrollbar$AccessibleAWTScrollBar(::java::awt::Scrollbar *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  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 = -344337268523697807LL;
-public: // actually package-private
-  ::java::awt::Scrollbar * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Scrollbar$AccessibleAWTScrollBar__
diff --git a/libjava/java/awt/Scrollbar.h b/libjava/java/awt/Scrollbar.h
deleted file mode 100644
index d13f504e979..00000000000
--- a/libjava/java/awt/Scrollbar.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Scrollbar__
-#define __java_awt_Scrollbar__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Scrollbar;
-      namespace event
-      {
-          class AdjustmentEvent;
-          class AdjustmentListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Scrollbar : public ::java::awt::Component
-{
-
-public:
-  Scrollbar();
-  Scrollbar(jint);
-  Scrollbar(jint, jint, jint, jint, jint);
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual jint getValue();
-  virtual void setValue(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getVisibleAmount();
-  virtual jint getVisible();
-  virtual void setVisibleAmount(jint);
-  virtual void setValues(jint, jint, jint, jint);
-  virtual jint getUnitIncrement();
-  virtual jint getLineIncrement();
-  virtual void setUnitIncrement(jint);
-  virtual void setLineIncrement(jint);
-  virtual jint getBlockIncrement();
-  virtual jint getPageIncrement();
-  virtual void setBlockIncrement(jint);
-  virtual void setPageIncrement(jint);
-  virtual void addNotify();
-  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processAdjustmentEvent(::java::awt::event::AdjustmentEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::AdjustmentListener * > * getAdjustmentListeners();
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  static const jint HORIZONTAL = 0;
-  static const jint VERTICAL = 1;
-private:
-  static const jlong serialVersionUID = 8451667562882310543LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::Component)))) lineIncrement;
-  jint pageIncrement;
-  jint maximum;
-  jint minimum;
-  jint orientation;
-  jint value;
-  jint visibleAmount;
-  ::java::awt::event::AdjustmentListener * adjustment_listeners;
-  jboolean valueIsAdjusting;
-  static jlong next_scrollbar_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Scrollbar__
diff --git a/libjava/java/awt/Shape.h b/libjava/java/awt/Shape.h
deleted file mode 100644
index facef750333..00000000000
--- a/libjava/java/awt/Shape.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Shape__
-#define __java_awt_Shape__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::Shape : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-  virtual jboolean contains(jdouble, jdouble) = 0;
-  virtual jboolean contains(::java::awt::geom::Point2D *) = 0;
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *) = 0;
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *) = 0;
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *) = 0;
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Shape__
diff --git a/libjava/java/awt/Stroke.h b/libjava/java/awt/Stroke.h
deleted file mode 100644
index bb04e488637..00000000000
--- a/libjava/java/awt/Stroke.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Stroke__
-#define __java_awt_Stroke__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-        class Stroke;
-    }
-  }
-}
-
-class java::awt::Stroke : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Shape * createStrokedShape(::java::awt::Shape *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Stroke__
diff --git a/libjava/java/awt/SystemColor.h b/libjava/java/awt/SystemColor.h
deleted file mode 100644
index 5e561faca5c..00000000000
--- a/libjava/java/awt/SystemColor.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_SystemColor__
-#define __java_awt_SystemColor__
-
-#pragma interface
-
-#include <java/awt/Color.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-        class SystemColor;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::SystemColor : public ::java::awt::Color
-{
-
-  SystemColor(jint);
-public:
-  jint getRGB();
-  ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4503142729533789064LL;
-public:
-  static const jint DESKTOP = 0;
-  static const jint ACTIVE_CAPTION = 1;
-  static const jint ACTIVE_CAPTION_TEXT = 2;
-  static const jint ACTIVE_CAPTION_BORDER = 3;
-  static const jint INACTIVE_CAPTION = 4;
-  static const jint INACTIVE_CAPTION_TEXT = 5;
-  static const jint INACTIVE_CAPTION_BORDER = 6;
-  static const jint WINDOW = 7;
-  static const jint WINDOW_BORDER = 8;
-  static const jint WINDOW_TEXT = 9;
-  static const jint MENU = 10;
-  static const jint MENU_TEXT = 11;
-  static const jint TEXT = 12;
-  static const jint TEXT_TEXT = 13;
-  static const jint TEXT_HIGHLIGHT = 14;
-  static const jint TEXT_HIGHLIGHT_TEXT = 15;
-  static const jint TEXT_INACTIVE_TEXT = 16;
-  static const jint CONTROL = 17;
-  static const jint CONTROL_TEXT = 18;
-  static const jint CONTROL_HIGHLIGHT = 19;
-  static const jint CONTROL_LT_HIGHLIGHT = 20;
-  static const jint CONTROL_SHADOW = 21;
-  static const jint CONTROL_DK_SHADOW = 22;
-  static const jint SCROLLBAR = 23;
-  static const jint INFO = 24;
-  static const jint INFO_TEXT = 25;
-  static const jint NUM_COLORS = 26;
-private:
-  static JArray< jint > * colors;
-public:
-  static ::java::awt::SystemColor * desktop;
-  static ::java::awt::SystemColor * activeCaption;
-  static ::java::awt::SystemColor * activeCaptionText;
-  static ::java::awt::SystemColor * activeCaptionBorder;
-  static ::java::awt::SystemColor * inactiveCaption;
-  static ::java::awt::SystemColor * inactiveCaptionText;
-  static ::java::awt::SystemColor * inactiveCaptionBorder;
-  static ::java::awt::SystemColor * window;
-  static ::java::awt::SystemColor * windowBorder;
-  static ::java::awt::SystemColor * windowText;
-  static ::java::awt::SystemColor * menu;
-  static ::java::awt::SystemColor * menuText;
-  static ::java::awt::SystemColor * text;
-  static ::java::awt::SystemColor * textText;
-  static ::java::awt::SystemColor * textHighlight;
-  static ::java::awt::SystemColor * textHighlightText;
-  static ::java::awt::SystemColor * textInactiveText;
-  static ::java::awt::SystemColor * control;
-  static ::java::awt::SystemColor * controlText;
-  static ::java::awt::SystemColor * controlHighlight;
-  static ::java::awt::SystemColor * controlLtHighlight;
-  static ::java::awt::SystemColor * controlShadow;
-  static ::java::awt::SystemColor * controlDkShadow;
-  static ::java::awt::SystemColor * scrollbar;
-  static ::java::awt::SystemColor * info;
-  static ::java::awt::SystemColor * infoText;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_SystemColor__
diff --git a/libjava/java/awt/TextArea$AccessibleAWTTextArea.h b/libjava/java/awt/TextArea$AccessibleAWTTextArea.h
deleted file mode 100644
index 0803d64183e..00000000000
--- a/libjava/java/awt/TextArea$AccessibleAWTTextArea.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextArea$AccessibleAWTTextArea__
-#define __java_awt_TextArea$AccessibleAWTTextArea__
-
-#pragma interface
-
-#include <java/awt/TextComponent$AccessibleAWTTextComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class TextArea;
-        class TextArea$AccessibleAWTTextArea;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::TextArea$AccessibleAWTTextArea : public ::java::awt::TextComponent$AccessibleAWTTextComponent
-{
-
-public: // actually protected
-  TextArea$AccessibleAWTTextArea(::java::awt::TextArea *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 3472827823632144419LL;
-public: // actually package-private
-  ::java::awt::TextArea * __attribute__((aligned(__alignof__( ::java::awt::TextComponent$AccessibleAWTTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextArea$AccessibleAWTTextArea__
diff --git a/libjava/java/awt/TextArea.h b/libjava/java/awt/TextArea.h
deleted file mode 100644
index d1b0d66c870..00000000000
--- a/libjava/java/awt/TextArea.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextArea__
-#define __java_awt_TextArea__
-
-#pragma interface
-
-#include <java/awt/TextComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class TextArea;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::TextArea : public ::java::awt::TextComponent
-{
-
-public:
-  TextArea();
-  TextArea(::java::lang::String *);
-  TextArea(jint, jint);
-  TextArea(::java::lang::String *, jint, jint);
-  TextArea(::java::lang::String *, jint, jint, jint);
-  virtual jint getColumns();
-  virtual void setColumns(jint);
-  virtual jint getRows();
-  virtual void setRows(jint);
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint);
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * minimumSize(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint);
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * preferredSize(jint, jint);
-  virtual jint getScrollbarVisibility();
-  virtual void addNotify();
-  virtual void append(::java::lang::String *);
-  virtual void appendText(::java::lang::String *);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void insertText(::java::lang::String *, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual void replaceText(::java::lang::String *, jint, jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  static const jint SCROLLBARS_BOTH = 0;
-  static const jint SCROLLBARS_VERTICAL_ONLY = 1;
-  static const jint SCROLLBARS_HORIZONTAL_ONLY = 2;
-  static const jint SCROLLBARS_NONE = 3;
-private:
-  static const jlong serialVersionUID = 3692302836626095722LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::TextComponent)))) columns;
-  jint rows;
-  jint scrollbarVisibility;
-  static jlong next_text_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextArea__
diff --git a/libjava/java/awt/TextComponent$AccessibleAWTTextComponent.h b/libjava/java/awt/TextComponent$AccessibleAWTTextComponent.h
deleted file mode 100644
index 94d0031a3e5..00000000000
--- a/libjava/java/awt/TextComponent$AccessibleAWTTextComponent.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextComponent$AccessibleAWTTextComponent__
-#define __java_awt_TextComponent$AccessibleAWTTextComponent__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-        class TextComponent;
-        class TextComponent$AccessibleAWTTextComponent;
-      namespace event
-      {
-          class TextEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleText;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class java::awt::TextComponent$AccessibleAWTTextComponent : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  TextComponent$AccessibleAWTTextComponent(::java::awt::TextComponent *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  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();
-  virtual void textValueChanged(::java::awt::event::TextEvent *);
-private:
-  static const jlong serialVersionUID = 3631432373506317811LL;
-public: // actually package-private
-  ::java::awt::TextComponent * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextComponent$AccessibleAWTTextComponent__
diff --git a/libjava/java/awt/TextComponent.h b/libjava/java/awt/TextComponent.h
deleted file mode 100644
index 2b12f8b29d2..00000000000
--- a/libjava/java/awt/TextComponent.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextComponent__
-#define __java_awt_TextComponent__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Point;
-        class Rectangle;
-        class TextComponent;
-      namespace event
-      {
-          class TextEvent;
-          class TextListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::TextComponent : public ::java::awt::Component
-{
-
-public: // actually package-private
-  TextComponent(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual ::java::lang::String * getSelectedText();
-  virtual jint getSelectionStart();
-  virtual void setSelectionStart(jint);
-  virtual jint getSelectionEnd();
-  virtual void setSelectionEnd(jint);
-  virtual void select(jint, jint);
-  virtual void selectAll();
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual jboolean isEditable();
-  virtual void setEditable(jboolean);
-  virtual void removeNotify();
-  virtual void addTextListener(::java::awt::event::TextListener *);
-  virtual void removeTextListener(::java::awt::event::TextListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processTextEvent(::java::awt::event::TextEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::TextListener * > * getTextListeners();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  static jboolean ignoreOldMouseEvents();
-private:
-  static const jlong serialVersionUID = -2214773872412987419LL;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::Component)))) editable;
-  jint selectionStart;
-  jint selectionEnd;
-  ::java::lang::String * text;
-public: // actually protected
-  ::java::awt::event::TextListener * textListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextComponent__
diff --git a/libjava/java/awt/TextField$AccessibleAWTTextField.h b/libjava/java/awt/TextField$AccessibleAWTTextField.h
deleted file mode 100644
index b49056a3f34..00000000000
--- a/libjava/java/awt/TextField$AccessibleAWTTextField.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextField$AccessibleAWTTextField__
-#define __java_awt_TextField$AccessibleAWTTextField__
-
-#pragma interface
-
-#include <java/awt/TextComponent$AccessibleAWTTextComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class TextField;
-        class TextField$AccessibleAWTTextField;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::TextField$AccessibleAWTTextField : public ::java::awt::TextComponent$AccessibleAWTTextComponent
-{
-
-public: // actually protected
-  TextField$AccessibleAWTTextField(::java::awt::TextField *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 6219164359235943158LL;
-public: // actually package-private
-  ::java::awt::TextField * __attribute__((aligned(__alignof__( ::java::awt::TextComponent$AccessibleAWTTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextField$AccessibleAWTTextField__
diff --git a/libjava/java/awt/TextField.h b/libjava/java/awt/TextField.h
deleted file mode 100644
index 747fe352155..00000000000
--- a/libjava/java/awt/TextField.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextField__
-#define __java_awt_TextField__
-
-#pragma interface
-
-#include <java/awt/TextComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Dimension;
-        class TextField;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::TextField : public ::java::awt::TextComponent
-{
-
-public:
-  TextField();
-  TextField(::java::lang::String *);
-  TextField(jint);
-  TextField(::java::lang::String *, jint);
-  virtual jint getColumns();
-  virtual void setColumns(jint);
-  virtual jchar getEchoChar();
-  virtual void setEchoChar(jchar);
-  virtual void setEchoCharacter(jchar);
-  virtual jboolean echoCharIsSet();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void addNotify();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processActionEvent(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static jlong next_textfield_number;
-  static const jlong serialVersionUID = -2966288784432217853LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::TextComponent)))) columns;
-  jchar echoChar;
-  ::java::awt::event::ActionListener * action_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextField__
diff --git a/libjava/java/awt/TexturePaint.h b/libjava/java/awt/TexturePaint.h
deleted file mode 100644
index a6711ad6b8a..00000000000
--- a/libjava/java/awt/TexturePaint.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TexturePaint__
-#define __java_awt_TexturePaint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-        class TexturePaint;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::TexturePaint : public ::java::lang::Object
-{
-
-public:
-  TexturePaint(::java::awt::image::BufferedImage *, ::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::image::BufferedImage * getImage();
-  virtual ::java::awt::geom::Rectangle2D * getAnchorRect();
-  virtual ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  virtual jint getTransparency();
-private:
-  ::java::awt::image::BufferedImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) texture;
-  ::java::awt::geom::Rectangle2D * anchor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TexturePaint__
diff --git a/libjava/java/awt/Toolkit$1.h b/libjava/java/awt/Toolkit$1.h
deleted file mode 100644
index 2cf1986dfcc..00000000000
--- a/libjava/java/awt/Toolkit$1.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Toolkit$1__
-#define __java_awt_Toolkit$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Toolkit$1;
-    }
-  }
-}
-
-class java::awt::Toolkit$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Toolkit$1();
-public:
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Toolkit$1__
diff --git a/libjava/java/awt/Toolkit$2.h b/libjava/java/awt/Toolkit$2.h
deleted file mode 100644
index f6e80d2e677..00000000000
--- a/libjava/java/awt/Toolkit$2.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Toolkit$2__
-#define __java_awt_Toolkit$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Toolkit$2;
-    }
-  }
-}
-
-class java::awt::Toolkit$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Toolkit$2();
-public:
-  virtual ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Toolkit$2__
diff --git a/libjava/java/awt/Toolkit.h b/libjava/java/awt/Toolkit.h
deleted file mode 100644
index 844ebe81571..00000000000
--- a/libjava/java/awt/Toolkit.h
+++ /dev/null
@@ -1,252 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Toolkit__
-#define __java_awt_Toolkit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class GLightweightPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Component;
-        class Container;
-        class Cursor;
-        class Desktop;
-        class Dialog;
-        class Dialog$ModalExclusionType;
-        class Dialog$ModalityType;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class JobAttributes;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class PageAttributes;
-        class Panel;
-        class Point;
-        class PopupMenu;
-        class PrintJob;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Toolkit;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace event
-      {
-          class AWTEventListener;
-          class AWTEventListenerProxy;
-      }
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class CanvasPeer;
-          class CheckboxMenuItemPeer;
-          class CheckboxPeer;
-          class ChoicePeer;
-          class DesktopPeer;
-          class DialogPeer;
-          class FileDialogPeer;
-          class FontPeer;
-          class FramePeer;
-          class LabelPeer;
-          class LightweightPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class MouseInfoPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class java::awt::Toolkit : public ::java::lang::Object
-{
-
-public:
-  Toolkit();
-public: // actually protected
-  virtual ::java::awt::peer::DesktopPeer * createDesktopPeer(::java::awt::Desktop *) = 0;
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *) = 0;
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *) = 0;
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *) = 0;
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *) = 0;
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *) = 0;
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *) = 0;
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *) = 0;
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *) = 0;
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *) = 0;
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *) = 0;
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *) = 0;
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *) = 0;
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *) = 0;
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *) = 0;
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *) = 0;
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *) = 0;
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *) = 0;
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *) = 0;
-  virtual ::java::awt::peer::MouseInfoPeer * getMouseInfoPeer();
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *) = 0;
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *) = 0;
-  virtual ::java::awt::peer::LightweightPeer * createComponent(::java::awt::Component *);
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint) = 0;
-  virtual void loadSystemColors(JArray< jint > *);
-public:
-  virtual void setDynamicLayout(jboolean);
-public: // actually protected
-  virtual jboolean isDynamicLayoutSet();
-public:
-  virtual jboolean isDynamicLayoutActive();
-  virtual ::java::awt::Dimension * getScreenSize() = 0;
-  virtual jint getScreenResolution() = 0;
-  virtual ::java::awt::Insets * getScreenInsets(::java::awt::GraphicsConfiguration *);
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual JArray< ::java::lang::String * > * getFontList() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual void sync() = 0;
-  static ::java::awt::Toolkit * getDefaultToolkit();
-  virtual ::java::awt::Image * getImage(::java::lang::String *) = 0;
-  virtual ::java::awt::Image * getImage(::java::net::URL *) = 0;
-  virtual ::java::awt::Image * createImage(::java::lang::String *) = 0;
-  virtual ::java::awt::Image * createImage(::java::net::URL *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *) = 0;
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::awt::JobAttributes *, ::java::awt::PageAttributes *);
-  virtual void beep() = 0;
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard() = 0;
-  virtual ::java::awt::datatransfer::Clipboard * getSystemSelection();
-  virtual jint getMenuShortcutKeyMask();
-  virtual jboolean getLockingKeyState(jint);
-  virtual void setLockingKeyState(jint, jboolean);
-public: // actually protected
-  static ::java::awt::Container * getNativeContainer(::java::awt::Component *);
-public:
-  virtual ::java::awt::Cursor * createCustomCursor(::java::awt::Image *, ::java::awt::Point *, ::java::lang::String *);
-  virtual ::java::awt::Dimension * getBestCursorSize(jint, jint);
-  virtual jint getMaximumCursorColors();
-  virtual jboolean isFrameStateSupported(jint);
-  static ::java::lang::String * getProperty(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::awt::EventQueue * getSystemEventQueue();
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl() = 0;
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *) = 0;
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDragGestureRecognizer(::java::lang::Class *, ::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual ::java::lang::Object * getDesktopProperty(::java::lang::String *);
-public: // actually protected
-  virtual void setDesktopProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * lazilyLoadDesktopProperty(::java::lang::String *);
-  virtual void initializeDesktopProperties();
-public:
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-  virtual void addAWTEventListener(::java::awt::event::AWTEventListener *, jlong);
-  virtual void removeAWTEventListener(::java::awt::event::AWTEventListener *);
-  virtual JArray< ::java::awt::event::AWTEventListener * > * getAWTEventListeners();
-  virtual JArray< ::java::awt::event::AWTEventListener * > * getAWTEventListeners(jlong);
-public: // actually package-private
-  virtual void globalDispatchEvent(::java::awt::AWTEvent *);
-public:
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *) = 0;
-  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *) = 0;
-  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *) = 0;
-private:
-  static void initAccessibility();
-  static ::java::lang::String * default_toolkit_name;
-  static ::java::awt::Toolkit * toolkit;
-  static ::java::util::Properties * props;
-public: // actually protected
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) desktopProperties;
-  ::java::beans::PropertyChangeSupport * desktopPropsSupport;
-public: // actually package-private
-  JArray< ::java::awt::event::AWTEventListenerProxy * > * awtEventListeners;
-private:
-  ::gnu::java::awt::peer::GLightweightPeer * lightweightPeer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Toolkit__
diff --git a/libjava/java/awt/Transparency.h b/libjava/java/awt/Transparency.h
deleted file mode 100644
index 1304a4647fe..00000000000
--- a/libjava/java/awt/Transparency.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Transparency__
-#define __java_awt_Transparency__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Transparency;
-    }
-  }
-}
-
-class java::awt::Transparency : public ::java::lang::Object
-{
-
-public:
-  virtual jint getTransparency() = 0;
-  static const jint OPAQUE = 1;
-  static const jint BITMASK = 2;
-  static const jint TRANSLUCENT = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Transparency__
diff --git a/libjava/java/awt/Window$AccessibleAWTWindow.h b/libjava/java/awt/Window$AccessibleAWTWindow.h
deleted file mode 100644
index aa4d2ced16f..00000000000
--- a/libjava/java/awt/Window$AccessibleAWTWindow.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Window$AccessibleAWTWindow__
-#define __java_awt_Window$AccessibleAWTWindow__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Window;
-        class Window$AccessibleAWTWindow;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::Window$AccessibleAWTWindow : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  Window$AccessibleAWTWindow(::java::awt::Window *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 4215068635060671780LL;
-public: // actually package-private
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Window$AccessibleAWTWindow__
diff --git a/libjava/java/awt/Window$WindowBltBufferStrategy.h b/libjava/java/awt/Window$WindowBltBufferStrategy.h
deleted file mode 100644
index eb29e059788..00000000000
--- a/libjava/java/awt/Window$WindowBltBufferStrategy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Window$WindowBltBufferStrategy__
-#define __java_awt_Window$WindowBltBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/Component$BltBufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Window;
-        class Window$WindowBltBufferStrategy;
-    }
-  }
-}
-
-class java::awt::Window$WindowBltBufferStrategy : public ::java::awt::Component$BltBufferStrategy
-{
-
-public: // actually package-private
-  Window$WindowBltBufferStrategy(::java::awt::Window *, jint, jboolean);
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::awt::Component$BltBufferStrategy)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Window$WindowBltBufferStrategy__
diff --git a/libjava/java/awt/Window$WindowFlipBufferStrategy.h b/libjava/java/awt/Window$WindowFlipBufferStrategy.h
deleted file mode 100644
index 0fd395f3ec3..00000000000
--- a/libjava/java/awt/Window$WindowFlipBufferStrategy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Window$WindowFlipBufferStrategy__
-#define __java_awt_Window$WindowFlipBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/Component$FlipBufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Window;
-        class Window$WindowFlipBufferStrategy;
-    }
-  }
-}
-
-class java::awt::Window$WindowFlipBufferStrategy : public ::java::awt::Component$FlipBufferStrategy
-{
-
-public: // actually package-private
-  Window$WindowFlipBufferStrategy(::java::awt::Window *, jint);
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::awt::Component$FlipBufferStrategy)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Window$WindowFlipBufferStrategy__
diff --git a/libjava/java/awt/Window.h b/libjava/java/awt/Window.h
deleted file mode 100644
index c1c73992e40..00000000000
--- a/libjava/java/awt/Window.h
+++ /dev/null
@@ -1,142 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Window__
-#define __java_awt_Window__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class Component;
-        class Container;
-        class Cursor;
-        class Event;
-        class Frame;
-        class GraphicsConfiguration;
-        class Toolkit;
-        class Window;
-      namespace event
-      {
-          class WindowEvent;
-          class WindowFocusListener;
-          class WindowListener;
-          class WindowStateListener;
-      }
-      namespace image
-      {
-          class BufferStrategy;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Window : public ::java::awt::Container
-{
-
-public: // actually package-private
-  Window();
-  Window(::java::awt::GraphicsConfiguration *);
-public:
-  Window(::java::awt::Frame *);
-  Window(::java::awt::Window *);
-  Window(::java::awt::Window *, ::java::awt::GraphicsConfiguration *);
-  virtual void addNotify();
-  virtual void pack();
-  virtual void show();
-  virtual void hide();
-  virtual void dispose();
-  virtual void toBack();
-  virtual void toFront();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual ::java::lang::String * getWarningString();
-  virtual ::java::util::Locale * getLocale();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Window * getOwner();
-  virtual JArray< ::java::awt::Window * > * getOwnedWindows();
-  virtual void addWindowListener(::java::awt::event::WindowListener *);
-  virtual void removeWindowListener(::java::awt::event::WindowListener *);
-  virtual JArray< ::java::awt::event::WindowListener * > * getWindowListeners();
-  virtual JArray< ::java::awt::event::WindowFocusListener * > * getWindowFocusListeners();
-  virtual JArray< ::java::awt::event::WindowStateListener * > * getWindowStateListeners();
-  virtual void addWindowFocusListener(::java::awt::event::WindowFocusListener *);
-  virtual void addWindowStateListener(::java::awt::event::WindowStateListener *);
-  virtual void removeWindowFocusListener(::java::awt::event::WindowFocusListener *);
-  virtual void removeWindowStateListener(::java::awt::event::WindowStateListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processWindowEvent(::java::awt::event::WindowEvent *);
-public:
-  virtual jboolean isActive();
-  virtual jboolean isFocused();
-  virtual ::java::awt::Component * getFocusOwner();
-  virtual ::java::awt::Component * getMostRecentFocusOwner();
-public: // actually package-private
-  virtual void setFocusOwner(::java::awt::Component *);
-public:
-  virtual jboolean postEvent(::java::awt::Event *);
-  virtual jboolean isShowing();
-  virtual void setLocationRelativeTo(::java::awt::Component *);
-  virtual void createBufferStrategy(jint);
-  virtual void createBufferStrategy(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::image::BufferStrategy * getBufferStrategy();
-  virtual void applyResourceBundle(::java::util::ResourceBundle *);
-  virtual void applyResourceBundle(::java::lang::String *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-public: // actually protected
-  virtual void processWindowFocusEvent(::java::awt::event::WindowEvent *);
-  virtual void processWindowStateEvent(::java::awt::event::WindowEvent *);
-public:
-  virtual jboolean isFocusableWindow();
-  virtual jboolean getFocusableWindowState();
-  virtual void setFocusableWindowState(jboolean);
-  virtual jboolean isFocusCycleRoot();
-  virtual void setFocusCycleRoot(jboolean);
-  virtual ::java::awt::Container * getFocusCycleRootAncestor();
-  virtual jboolean isAlwaysOnTop();
-  virtual void setAlwaysOnTop(jboolean);
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-  virtual jboolean eventTypeEnabled(jint);
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = 4497834738069338734LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::Container)))) warningString;
-  jint windowSerializedDataVersion;
-  jint state;
-  jboolean focusableWindowState;
-  jboolean alwaysOnTop;
-  ::java::util::Vector * ownedWindows;
-  ::java::awt::event::WindowListener * windowListener;
-  ::java::awt::event::WindowFocusListener * windowFocusListener;
-  ::java::awt::event::WindowStateListener * windowStateListener;
-  jboolean shown;
-public: // actually package-private
-  ::java::awt::Component * windowFocusOwner;
-private:
-  static jlong next_window_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Window__
diff --git a/libjava/java/awt/color/CMMException.h b/libjava/java/awt/color/CMMException.h
deleted file mode 100644
index b6ee5337abf..00000000000
--- a/libjava/java/awt/color/CMMException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_CMMException__
-#define __java_awt_color_CMMException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class CMMException;
-      }
-    }
-  }
-}
-
-class java::awt::color::CMMException : public ::java::lang::RuntimeException
-{
-
-public:
-  CMMException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5775558044142994965LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_CMMException__
diff --git a/libjava/java/awt/color/ColorSpace.h b/libjava/java/awt/color/ColorSpace.h
deleted file mode 100644
index cb8ec13c394..00000000000
--- a/libjava/java/awt/color/ColorSpace.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ColorSpace__
-#define __java_awt_color_ColorSpace__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-    }
-  }
-}
-
-class java::awt::color::ColorSpace : public ::java::lang::Object
-{
-
-public: // actually protected
-  ColorSpace(jint, jint);
-public:
-  static ::java::awt::color::ColorSpace * getInstance(jint);
-  virtual jboolean isCS_sRGB();
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *) = 0;
-  virtual jint getType();
-  virtual jint getNumComponents();
-  virtual ::java::lang::String * getName(jint);
-  virtual jfloat getMinValue(jint);
-  virtual jfloat getMaxValue(jint);
-private:
-  static const jlong serialVersionUID = -409452704308689724LL;
-public:
-  static const jint TYPE_XYZ = 0;
-  static const jint TYPE_Lab = 1;
-  static const jint TYPE_Luv = 2;
-  static const jint TYPE_YCbCr = 3;
-  static const jint TYPE_Yxy = 4;
-  static const jint TYPE_RGB = 5;
-  static const jint TYPE_GRAY = 6;
-  static const jint TYPE_HSV = 7;
-  static const jint TYPE_HLS = 8;
-  static const jint TYPE_CMYK = 9;
-  static const jint TYPE_CMY = 11;
-  static const jint TYPE_2CLR = 12;
-  static const jint TYPE_3CLR = 13;
-  static const jint TYPE_4CLR = 14;
-  static const jint TYPE_5CLR = 15;
-  static const jint TYPE_6CLR = 16;
-  static const jint TYPE_7CLR = 17;
-  static const jint TYPE_8CLR = 18;
-  static const jint TYPE_9CLR = 19;
-  static const jint TYPE_ACLR = 20;
-  static const jint TYPE_BCLR = 21;
-  static const jint TYPE_CCLR = 22;
-  static const jint TYPE_DCLR = 23;
-  static const jint TYPE_ECLR = 24;
-  static const jint TYPE_FCLR = 25;
-  static const jint CS_sRGB = 1000;
-  static const jint CS_LINEAR_RGB = 1004;
-  static const jint CS_CIEXYZ = 1001;
-  static const jint CS_PYCC = 1002;
-  static const jint CS_GRAY = 1003;
-private:
-  static const jint CS_BASE = 1000;
-  static const jint CS_END = 1005;
-  static const jint CS_COUNT = 5;
-  static JArray< ::java::awt::color::ColorSpace * > * INSTANCES;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jint numComponents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ColorSpace__
diff --git a/libjava/java/awt/color/ICC_ColorSpace.h b/libjava/java/awt/color/ICC_ColorSpace.h
deleted file mode 100644
index 6dd2117912b..00000000000
--- a/libjava/java/awt/color/ICC_ColorSpace.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ICC_ColorSpace__
-#define __java_awt_color_ICC_ColorSpace__
-
-#pragma interface
-
-#include <java/awt/color/ColorSpace.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorSpaceConverter;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ColorSpace;
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class java::awt::color::ICC_ColorSpace : public ::java::awt::color::ColorSpace
-{
-
-public:
-  ICC_ColorSpace(::java::awt::color::ICC_Profile *);
-  virtual ::java::awt::color::ICC_Profile * getProfile();
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual jboolean isCS_sRGB();
-  virtual jfloat getMinValue(jint);
-  virtual jfloat getMaxValue(jint);
-private:
-  ::gnu::java::awt::color::ColorSpaceConverter * getConverter(::java::awt::color::ICC_Profile *);
-  void makeArrays();
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 3455889114070431483LL;
-  ::java::awt::color::ICC_Profile * __attribute__((aligned(__alignof__( ::java::awt::color::ColorSpace)))) thisProfile;
-  JArray< jfloat > * minVal;
-  JArray< jfloat > * maxVal;
-  JArray< jfloat > * diffMinMax;
-  JArray< jfloat > * invDiffMinMax;
-  jboolean needScaleInit;
-  jint type;
-  jint nComponents;
-  ::gnu::java::awt::color::ColorSpaceConverter * converter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ICC_ColorSpace__
diff --git a/libjava/java/awt/color/ICC_Profile.h b/libjava/java/awt/color/ICC_Profile.h
deleted file mode 100644
index d6a406e033f..00000000000
--- a/libjava/java/awt/color/ICC_Profile.h
+++ /dev/null
@@ -1,217 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ICC_Profile__
-#define __java_awt_color_ICC_Profile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ProfileHeader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class java::awt::color::ICC_Profile : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ICC_Profile(jint);
-  ICC_Profile(::gnu::java::awt::color::ProfileHeader *, ::java::util::Hashtable *);
-  ICC_Profile(JArray< jbyte > *);
-public: // actually protected
-  virtual void finalize();
-public:
-  static ::java::awt::color::ICC_Profile * getInstance(JArray< jbyte > *);
-  static ::java::awt::color::ICC_Profile * getInstance(jint);
-  static ::java::awt::color::ICC_Profile * getInstance(::java::lang::String *);
-  static ::java::awt::color::ICC_Profile * getInstance(::java::io::InputStream *);
-  virtual jint getMajorVersion();
-  virtual jint getMinorVersion();
-  virtual jint getProfileClass();
-  virtual jint getColorSpaceType();
-  virtual jint getPCSType();
-  virtual void write(::java::lang::String *);
-  virtual void write(::java::io::OutputStream *);
-  virtual JArray< jbyte > * getData();
-  virtual JArray< jbyte > * getData(jint);
-  virtual void setData(jint, JArray< jbyte > *);
-  virtual jint getNumComponents();
-public: // actually protected
-  virtual ::java::lang::Object * readResolve();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static ::java::util::Hashtable * createTagTable(JArray< jbyte > *);
-  jint getSize();
-  JArray< jbyte > * getTagTable();
-  static jboolean isRGBProfile(::gnu::java::awt::color::ProfileHeader *, ::java::util::Hashtable *);
-  static jboolean isGrayProfile(::gnu::java::awt::color::ProfileHeader *, ::java::util::Hashtable *);
-public: // actually package-private
-  virtual JArray< jshort > * getCurve(jint);
-  virtual JArray< jfloat > * getXYZData(jint);
-  virtual jint isPredefined();
-private:
-  JArray< jbyte > * makeXYZData(JArray< jfloat > *);
-  JArray< jbyte > * makeTextTag(::java::lang::String *);
-  JArray< jbyte > * makeDescTag(::java::lang::String *);
-  JArray< jbyte > * makeTRC();
-  JArray< jbyte > * makeTRC(jfloat);
-  JArray< jbyte > * makeTRC(JArray< jfloat > *);
-  JArray< jbyte > * makeIdentityClut();
-  void createProfile(jint);
-  void createRGBProfile();
-  void createLinearRGBProfile();
-  void createCIEProfile();
-  void createGrayProfile();
-  void createPyccProfile();
-  static const jlong serialVersionUID = -3938515861990936766LL;
-public:
-  static const jint CLASS_INPUT = 0;
-  static const jint CLASS_DISPLAY = 1;
-  static const jint CLASS_OUTPUT = 2;
-  static const jint CLASS_DEVICELINK = 3;
-  static const jint CLASS_COLORSPACECONVERSION = 4;
-  static const jint CLASS_ABSTRACT = 5;
-  static const jint CLASS_NAMEDCOLOR = 6;
-  static const jint icSigInputClass = 1935896178;
-  static const jint icSigDisplayClass = 1835955314;
-  static const jint icSigOutputClass = 1886549106;
-  static const jint icSigLinkClass = 1818848875;
-  static const jint icSigColorSpaceClass = 1936744803;
-  static const jint icSigAbstractClass = 1633842036;
-  static const jint icSigNamedColorClass = 1852662636;
-  static const jint icSigXYZData = 1482250784;
-  static const jint icSigLabData = 1281450528;
-  static const jint icSigLuvData = 1282766368;
-  static const jint icSigYCbCrData = 1497588338;
-  static const jint icSigYxyData = 1501067552;
-  static const jint icSigRgbData = 1380401696;
-  static const jint icSigGrayData = 1196573017;
-  static const jint icSigHsvData = 1213421088;
-  static const jint icSigHlsData = 1212961568;
-  static const jint icSigCmykData = 1129142603;
-  static const jint icSigCmyData = 1129142560;
-  static const jint icSigSpace2CLR = 843271250;
-  static const jint icSigSpace3CLR = 860048466;
-  static const jint icSigSpace4CLR = 876825682;
-  static const jint icSigSpace5CLR = 893602898;
-  static const jint icSigSpace6CLR = 910380114;
-  static const jint icSigSpace7CLR = 927157330;
-  static const jint icSigSpace8CLR = 943934546;
-  static const jint icSigSpace9CLR = 960711762;
-  static const jint icSigSpaceACLR = 1094929490;
-  static const jint icSigSpaceBCLR = 1111706706;
-  static const jint icSigSpaceCCLR = 1128483922;
-  static const jint icSigSpaceDCLR = 1145261138;
-  static const jint icSigSpaceECLR = 1162038354;
-  static const jint icSigSpaceFCLR = 1178815570;
-  static const jint icPerceptual = 0;
-  static const jint icRelativeColorimetric = 1;
-  static const jint icSaturation = 2;
-  static const jint icAbsoluteColorimetric = 3;
-  static const jint icSigAToB0Tag = 1093812784;
-  static const jint icSigAToB1Tag = 1093812785;
-  static const jint icSigAToB2Tag = 1093812786;
-  static const jint icSigBlueColorantTag = 1649957210;
-  static const jint icSigBlueTRCTag = 1649693251;
-  static const jint icSigBToA0Tag = 1110589744;
-  static const jint icSigBToA1Tag = 1110589745;
-  static const jint icSigBToA2Tag = 1110589746;
-  static const jint icSigCalibrationDateTimeTag = 1667329140;
-  static const jint icSigCharTargetTag = 1952543335;
-  static const jint icSigCopyrightTag = 1668313716;
-  static const jint icSigCrdInfoTag = 1668441193;
-  static const jint icSigDeviceMfgDescTag = 1684893284;
-  static const jint icSigDeviceModelDescTag = 1684890724;
-  static const jint icSigDeviceSettingsTag = 1684371059;
-  static const jint icSigGamutTag = 1734438260;
-  static const jint icSigGrayTRCTag = 1800688195;
-  static const jint icSigGreenColorantTag = 1733843290;
-  static const jint icSigGreenTRCTag = 1733579331;
-  static const jint icSigLuminanceTag = 1819635049;
-  static const jint icSigMeasurementTag = 1835360627;
-  static const jint icSigMediaBlackPointTag = 1651208308;
-  static const jint icSigMediaWhitePointTag = 2004119668;
-  static const jint icSigNamedColor2Tag = 1852009522;
-  static const jint icSigOutputResponseTag = 1919251312;
-  static const jint icSigPreview0Tag = 1886545200;
-  static const jint icSigPreview1Tag = 1886545201;
-  static const jint icSigPreview2Tag = 1886545202;
-  static const jint icSigProfileDescriptionTag = 1684370275;
-  static const jint icSigProfileSequenceDescTag = 1886610801;
-  static const jint icSigPs2CRD0Tag = 1886610480;
-  static const jint icSigPs2CRD1Tag = 1886610481;
-  static const jint icSigPs2CRD2Tag = 1886610482;
-  static const jint icSigPs2CRD3Tag = 1886610483;
-  static const jint icSigPs2CSATag = 1886597747;
-  static const jint icSigPs2RenderingIntentTag = 1886597737;
-  static const jint icSigRedColorantTag = 1918392666;
-  static const jint icSigRedTRCTag = 1918128707;
-  static const jint icSigScreeningDescTag = 1935897188;
-  static const jint icSigScreeningTag = 1935897198;
-  static const jint icSigTechnologyTag = 1952801640;
-  static const jint icSigUcrBgTag = 1650877472;
-  static const jint icSigViewingCondDescTag = 1987405156;
-  static const jint icSigViewingConditionsTag = 1986618743;
-  static const jint icSigChromaticityTag = 1667789421;
-  static const jint icSigHead = 1751474532;
-  static const jint icHdrSize = 0;
-  static const jint icHdrCmmId = 4;
-  static const jint icHdrVersion = 8;
-  static const jint icHdrDeviceClass = 12;
-  static const jint icHdrColorSpace = 16;
-  static const jint icHdrPcs = 20;
-  static const jint icHdrDate = 24;
-  static const jint icHdrMagic = 36;
-  static const jint icHdrPlatform = 40;
-  static const jint icHdrFlags = 44;
-  static const jint icHdrManufacturer = 48;
-  static const jint icHdrModel = 52;
-  static const jint icHdrAttributes = 56;
-  static const jint icHdrRenderingIntent = 64;
-  static const jint icHdrIlluminant = 68;
-  static const jint icHdrCreator = 80;
-  static const jint icTagType = 0;
-  static const jint icTagReserved = 4;
-  static const jint icCurveCount = 8;
-  static const jint icCurveData = 12;
-  static const jint icXYZNumberX = 8;
-private:
-  static const jint tagTableOffset = 128;
-  static const jint iccProfileSerializedDataVersion = 1;
-  static ::java::lang::String * copyrightNotice;
-  static const jint TRC_POINTS = 1024;
-  static JArray< jfloat > * D50;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) profileID;
-  ::gnu::java::awt::color::ProfileHeader * header;
-  ::java::util::Hashtable * tagTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ICC_Profile__
diff --git a/libjava/java/awt/color/ICC_ProfileGray.h b/libjava/java/awt/color/ICC_ProfileGray.h
deleted file mode 100644
index 9ebeef8dea2..00000000000
--- a/libjava/java/awt/color/ICC_ProfileGray.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ICC_ProfileGray__
-#define __java_awt_color_ICC_ProfileGray__
-
-#pragma interface
-
-#include <java/awt/color/ICC_Profile.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ProfileGray;
-      }
-    }
-  }
-}
-
-class java::awt::color::ICC_ProfileGray : public ::java::awt::color::ICC_Profile
-{
-
-public: // actually package-private
-  ICC_ProfileGray(jint);
-  ICC_ProfileGray(JArray< jbyte > *);
-public:
-  virtual JArray< jfloat > * getMediaWhitePoint();
-  virtual jfloat getGamma();
-  virtual JArray< jshort > * getTRC();
-private:
-  static const jlong serialVersionUID = -1124721290732002649LL;
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::awt::color::ICC_Profile)))) whitePoint;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ICC_ProfileGray__
diff --git a/libjava/java/awt/color/ICC_ProfileRGB.h b/libjava/java/awt/color/ICC_ProfileRGB.h
deleted file mode 100644
index 7520d8af6c1..00000000000
--- a/libjava/java/awt/color/ICC_ProfileRGB.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ICC_ProfileRGB__
-#define __java_awt_color_ICC_ProfileRGB__
-
-#pragma interface
-
-#include <java/awt/color/ICC_Profile.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ProfileRGB;
-      }
-    }
-  }
-}
-
-class java::awt::color::ICC_ProfileRGB : public ::java::awt::color::ICC_Profile
-{
-
-public: // actually package-private
-  ICC_ProfileRGB(jint);
-  ICC_ProfileRGB(JArray< jbyte > *);
-public:
-  virtual JArray< jfloat > * getMediaWhitePoint();
-  virtual JArray< JArray< jfloat > * > * getMatrix();
-  virtual jfloat getGamma(jint);
-  virtual JArray< jshort > * getTRC(jint);
-private:
-  JArray< JArray< jfloat > * > * createMatrix();
-  static const jlong serialVersionUID = 8505067385152579334LL;
-public:
-  static const jint REDCOMPONENT = 0;
-  static const jint GREENCOMPONENT = 1;
-  static const jint BLUECOMPONENT = 2;
-private:
-  JArray< JArray< jfloat > * > * __attribute__((aligned(__alignof__( ::java::awt::color::ICC_Profile)))) matrix;
-  JArray< jfloat > * gamma;
-  JArray< jfloat > * whitePoint;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ICC_ProfileRGB__
diff --git a/libjava/java/awt/color/ProfileDataException.h b/libjava/java/awt/color/ProfileDataException.h
deleted file mode 100644
index 593bf1326ca..00000000000
--- a/libjava/java/awt/color/ProfileDataException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ProfileDataException__
-#define __java_awt_color_ProfileDataException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ProfileDataException;
-      }
-    }
-  }
-}
-
-class java::awt::color::ProfileDataException : public ::java::lang::RuntimeException
-{
-
-public:
-  ProfileDataException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7286140888240322498LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ProfileDataException__
diff --git a/libjava/java/awt/datatransfer/Clipboard.h b/libjava/java/awt/datatransfer/Clipboard.h
deleted file mode 100644
index 5ae0769e181..00000000000
--- a/libjava/java/awt/datatransfer/Clipboard.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_Clipboard__
-#define __java_awt_datatransfer_Clipboard__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class ClipboardOwner;
-          class DataFlavor;
-          class FlavorListener;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::Clipboard : public ::java::lang::Object
-{
-
-public:
-  Clipboard(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::awt::datatransfer::Transferable * getContents(::java::lang::Object *);
-  virtual void setContents(::java::awt::datatransfer::Transferable *, ::java::awt::datatransfer::ClipboardOwner *);
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getAvailableDataFlavors();
-  virtual jboolean isDataFlavorAvailable(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::lang::Object * getData(::java::awt::datatransfer::DataFlavor *);
-  virtual void addFlavorListener(::java::awt::datatransfer::FlavorListener *);
-  virtual void removeFlavorListener(::java::awt::datatransfer::FlavorListener *);
-  virtual JArray< ::java::awt::datatransfer::FlavorListener * > * getFlavorListeners();
-public: // actually protected
-  ::java::awt::datatransfer::Transferable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) contents;
-  ::java::awt::datatransfer::ClipboardOwner * owner;
-private:
-  ::java::lang::String * name;
-  ::java::util::ArrayList * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_Clipboard__
diff --git a/libjava/java/awt/datatransfer/ClipboardOwner.h b/libjava/java/awt/datatransfer/ClipboardOwner.h
deleted file mode 100644
index d20a514b322..00000000000
--- a/libjava/java/awt/datatransfer/ClipboardOwner.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_ClipboardOwner__
-#define __java_awt_datatransfer_ClipboardOwner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class ClipboardOwner;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::ClipboardOwner : public ::java::lang::Object
-{
-
-public:
-  virtual void lostOwnership(::java::awt::datatransfer::Clipboard *, ::java::awt::datatransfer::Transferable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_ClipboardOwner__
diff --git a/libjava/java/awt/datatransfer/DataFlavor.h b/libjava/java/awt/datatransfer/DataFlavor.h
deleted file mode 100644
index 3a94cabef65..00000000000
--- a/libjava/java/awt/datatransfer/DataFlavor.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_DataFlavor__
-#define __java_awt_datatransfer_DataFlavor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class MimeType;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::DataFlavor : public ::java::lang::Object
-{
-
-public: // actually protected
-  static ::java::lang::Class * tryToLoadClass(::java::lang::String *, ::java::lang::ClassLoader *);
-public:
-  static ::java::awt::datatransfer::DataFlavor * getTextPlainUnicodeFlavor();
-  static ::java::awt::datatransfer::DataFlavor * selectBestTextFlavor(JArray< ::java::awt::datatransfer::DataFlavor * > *);
-  DataFlavor();
-  DataFlavor(::java::lang::Class *, ::java::lang::String *);
-  DataFlavor(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  DataFlavor(::java::lang::String *, ::java::lang::String *);
-  DataFlavor(::java::lang::String *);
-private:
-  void init(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-public:
-  virtual ::java::lang::String * getMimeType();
-  virtual ::java::lang::Class * getRepresentationClass();
-  virtual ::java::lang::String * getHumanPresentableName();
-  virtual ::java::lang::String * getPrimaryType();
-  virtual ::java::lang::String * getSubType();
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual void setHumanPresentableName(::java::lang::String *);
-  virtual jboolean isMimeTypeEqual(::java::lang::String *);
-  virtual jboolean isMimeTypeEqual(::java::awt::datatransfer::DataFlavor *);
-  virtual jboolean isMimeTypeSerializedObject();
-  virtual jboolean isRepresentationClassInputStream();
-  virtual jboolean isRepresentationClassSerializable();
-  virtual jboolean isRepresentationClassRemote();
-  virtual jboolean isFlavorSerializedObjectType();
-  virtual jboolean isFlavorRemoteObjectType();
-  virtual jboolean isFlavorJavaFileListType();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::awt::datatransfer::DataFlavor *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::String *);
-  virtual jint hashCode();
-  virtual jboolean match(::java::awt::datatransfer::DataFlavor *);
-public: // actually protected
-  virtual ::java::lang::String * normalizeMimeTypeParameter(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * normalizeMimeType(::java::lang::String *);
-public:
-  virtual void writeExternal(::java::io::ObjectOutput *);
-  virtual void readExternal(::java::io::ObjectInput *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::Class * getDefaultRepresentationClass();
-  virtual ::java::lang::String * getDefaultRepresentationClassAsString();
-  virtual ::java::io::Reader * getReaderForText(::java::awt::datatransfer::Transferable *);
-  virtual jboolean isRepresentationClassByteBuffer();
-  virtual jboolean isRepresentationClassCharBuffer();
-  virtual jboolean isRepresentationClassReader();
-  virtual jboolean isFlavorTextType();
-public: // actually package-private
-  static const jlong serialVersionUID = 8367026044764648243LL;
-public:
-  static ::java::awt::datatransfer::DataFlavor * plainTextFlavor;
-  static ::java::awt::datatransfer::DataFlavor * stringFlavor;
-  static ::java::awt::datatransfer::DataFlavor * javaFileListFlavor;
-  static ::java::awt::datatransfer::DataFlavor * imageFlavor;
-  static ::java::lang::String * javaSerializedObjectMimeType;
-  static ::java::lang::String * javaJVMLocalObjectMimeType;
-  static ::java::lang::String * javaRemoteObjectMimeType;
-private:
-  ::java::awt::datatransfer::MimeType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mimeType;
-  ::java::lang::Class * representationClass;
-  ::java::lang::String * humanPresentableName;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_DataFlavor__
diff --git a/libjava/java/awt/datatransfer/FlavorEvent.h b/libjava/java/awt/datatransfer/FlavorEvent.h
deleted file mode 100644
index 00cfae1c058..00000000000
--- a/libjava/java/awt/datatransfer/FlavorEvent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_FlavorEvent__
-#define __java_awt_datatransfer_FlavorEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class FlavorEvent;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::FlavorEvent : public ::java::util::EventObject
-{
-
-public:
-  FlavorEvent(::java::awt::datatransfer::Clipboard *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_FlavorEvent__
diff --git a/libjava/java/awt/datatransfer/FlavorListener.h b/libjava/java/awt/datatransfer/FlavorListener.h
deleted file mode 100644
index 0e23dbb78e7..00000000000
--- a/libjava/java/awt/datatransfer/FlavorListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_FlavorListener__
-#define __java_awt_datatransfer_FlavorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class FlavorEvent;
-          class FlavorListener;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::FlavorListener : public ::java::lang::Object
-{
-
-public:
-  virtual void flavorsChanged(::java::awt::datatransfer::FlavorEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_FlavorListener__
diff --git a/libjava/java/awt/datatransfer/FlavorMap.h b/libjava/java/awt/datatransfer/FlavorMap.h
deleted file mode 100644
index 688576910ae..00000000000
--- a/libjava/java/awt/datatransfer/FlavorMap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_FlavorMap__
-#define __java_awt_datatransfer_FlavorMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class FlavorMap;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::FlavorMap : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Map * getNativesForFlavors(JArray< ::java::awt::datatransfer::DataFlavor * > *) = 0;
-  virtual ::java::util::Map * getFlavorsForNatives(JArray< ::java::lang::String * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_FlavorMap__
diff --git a/libjava/java/awt/datatransfer/FlavorTable.h b/libjava/java/awt/datatransfer/FlavorTable.h
deleted file mode 100644
index cec9406264a..00000000000
--- a/libjava/java/awt/datatransfer/FlavorTable.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_FlavorTable__
-#define __java_awt_datatransfer_FlavorTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class FlavorTable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::FlavorTable : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::List * getNativesForFlavor(::java::awt::datatransfer::DataFlavor *) = 0;
-  virtual ::java::util::List * getFlavorsForNative(::java::lang::String *) = 0;
-  virtual ::java::util::Map * getNativesForFlavors(JArray< ::java::awt::datatransfer::DataFlavor * > *) = 0;
-  virtual ::java::util::Map * getFlavorsForNatives(JArray< ::java::lang::String * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_FlavorTable__
diff --git a/libjava/java/awt/datatransfer/MimeType.h b/libjava/java/awt/datatransfer/MimeType.h
deleted file mode 100644
index 9ccd153f768..00000000000
--- a/libjava/java/awt/datatransfer/MimeType.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_MimeType__
-#define __java_awt_datatransfer_MimeType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class MimeType;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::MimeType : public ::java::lang::Object
-{
-
-public:
-  MimeType();
-public: // actually package-private
-  MimeType(::java::lang::String *);
-  virtual void addParameter(::java::lang::String *, ::java::lang::String *);
-  virtual void removeParameter(::java::lang::String *);
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual ::java::lang::String * getPrimaryType();
-  virtual ::java::lang::String * getSubType();
-  virtual ::java::lang::String * getBaseType();
-  virtual jboolean matches(::java::awt::datatransfer::MimeType *);
-public:
-  virtual void readExternal(::java::io::ObjectInput *);
-  virtual void writeExternal(::java::io::ObjectOutput *);
-  virtual ::java::lang::String * toString();
-private:
-  void parse(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) primaryType;
-  ::java::lang::String * subType;
-  ::java::util::HashMap * parameters;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_MimeType__
diff --git a/libjava/java/awt/datatransfer/MimeTypeParseException.h b/libjava/java/awt/datatransfer/MimeTypeParseException.h
deleted file mode 100644
index 5ac3ff2d3cc..00000000000
--- a/libjava/java/awt/datatransfer/MimeTypeParseException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_MimeTypeParseException__
-#define __java_awt_datatransfer_MimeTypeParseException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class MimeTypeParseException;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::MimeTypeParseException : public ::java::lang::Exception
-{
-
-public:
-  MimeTypeParseException();
-  MimeTypeParseException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5604407764691570741LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_MimeTypeParseException__
diff --git a/libjava/java/awt/datatransfer/StringSelection.h b/libjava/java/awt/datatransfer/StringSelection.h
deleted file mode 100644
index 09429bba1f3..00000000000
--- a/libjava/java/awt/datatransfer/StringSelection.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_StringSelection__
-#define __java_awt_datatransfer_StringSelection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class DataFlavor;
-          class StringSelection;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::StringSelection : public ::java::lang::Object
-{
-
-public:
-  StringSelection(::java::lang::String *);
-  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 lostOwnership(::java::awt::datatransfer::Clipboard *, ::java::awt::datatransfer::Transferable *);
-public: // actually package-private
-  static JArray< ::java::awt::datatransfer::DataFlavor * > * supported_flavors;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_StringSelection__
diff --git a/libjava/java/awt/datatransfer/SystemFlavorMap$1.h b/libjava/java/awt/datatransfer/SystemFlavorMap$1.h
deleted file mode 100644
index bfb3023aa8b..00000000000
--- a/libjava/java/awt/datatransfer/SystemFlavorMap$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_SystemFlavorMap$1__
-#define __java_awt_datatransfer_SystemFlavorMap$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class SystemFlavorMap;
-          class SystemFlavorMap$1;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::SystemFlavorMap$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SystemFlavorMap$1(::java::awt::datatransfer::SystemFlavorMap *);
-public:
-  virtual ::java::lang::Object * run();
-public: // actually package-private
-  ::java::awt::datatransfer::SystemFlavorMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_SystemFlavorMap$1__
diff --git a/libjava/java/awt/datatransfer/SystemFlavorMap.h b/libjava/java/awt/datatransfer/SystemFlavorMap.h
deleted file mode 100644
index de2495c8b79..00000000000
--- a/libjava/java/awt/datatransfer/SystemFlavorMap.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_SystemFlavorMap__
-#define __java_awt_datatransfer_SystemFlavorMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class FlavorMap;
-          class SystemFlavorMap;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::SystemFlavorMap : public ::java::lang::Object
-{
-
-  SystemFlavorMap();
-public: // actually package-private
-  void setupMapping(::java::util::Properties *);
-public:
-  ::java::util::Map * getNativesForFlavors(JArray< ::java::awt::datatransfer::DataFlavor * > *);
-  ::java::util::Map * getFlavorsForNatives(JArray< ::java::lang::String * > *);
-  static ::java::awt::datatransfer::FlavorMap * getDefaultFlavorMap();
-  static ::java::lang::String * encodeJavaMIMEType(::java::lang::String *);
-  static ::java::lang::String * encodeDataFlavor(::java::awt::datatransfer::DataFlavor *);
-  static jboolean isJavaMIMEType(::java::lang::String *);
-  static ::java::lang::String * decodeJavaMIMEType(::java::lang::String *);
-  static ::java::awt::datatransfer::DataFlavor * decodeDataFlavor(::java::lang::String *);
-  ::java::util::List * getFlavorsForNative(::java::lang::String *);
-  ::java::util::List * getNativesForFlavor(::java::awt::datatransfer::DataFlavor *);
-  void addFlavorForUnencodedNative(::java::lang::String *, ::java::awt::datatransfer::DataFlavor *);
-  void addUnencodedNativeForFlavor(::java::awt::datatransfer::DataFlavor *, ::java::lang::String *);
-  void setNativesForFlavor(::java::awt::datatransfer::DataFlavor *, JArray< ::java::lang::String * > *);
-  void setFlavorsForNative(::java::lang::String *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
-private:
-  static ::java::util::Map * systemFlavorMaps;
-  static ::java::lang::String * GNU_JAVA_MIME_PREFIX;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nativeToFlavorMap;
-  ::java::util::HashMap * flavorToNativeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_SystemFlavorMap__
diff --git a/libjava/java/awt/datatransfer/Transferable.h b/libjava/java/awt/datatransfer/Transferable.h
deleted file mode 100644
index 0930f87d040..00000000000
--- a/libjava/java/awt/datatransfer/Transferable.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_Transferable__
-#define __java_awt_datatransfer_Transferable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::Transferable : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors() = 0;
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *) = 0;
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_Transferable__
diff --git a/libjava/java/awt/datatransfer/UnsupportedFlavorException.h b/libjava/java/awt/datatransfer/UnsupportedFlavorException.h
deleted file mode 100644
index fffc2ace08a..00000000000
--- a/libjava/java/awt/datatransfer/UnsupportedFlavorException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_UnsupportedFlavorException__
-#define __java_awt_datatransfer_UnsupportedFlavorException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class UnsupportedFlavorException;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::UnsupportedFlavorException : public ::java::lang::Exception
-{
-
-public:
-  UnsupportedFlavorException(::java::awt::datatransfer::DataFlavor *);
-private:
-  static const jlong serialVersionUID = 5383814944251665601LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_UnsupportedFlavorException__
diff --git a/libjava/java/awt/dnd/Autoscroll.h b/libjava/java/awt/dnd/Autoscroll.h
deleted file mode 100644
index 4ab4c6a5cb0..00000000000
--- a/libjava/java/awt/dnd/Autoscroll.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_Autoscroll__
-#define __java_awt_dnd_Autoscroll__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-        class Point;
-      namespace dnd
-      {
-          class Autoscroll;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::Autoscroll : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Insets * getAutoscrollInsets() = 0;
-  virtual void autoscroll(::java::awt::Point *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_Autoscroll__
diff --git a/libjava/java/awt/dnd/DnDConstants.h b/libjava/java/awt/dnd/DnDConstants.h
deleted file mode 100644
index a3cfb089ffd..00000000000
--- a/libjava/java/awt/dnd/DnDConstants.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DnDConstants__
-#define __java_awt_dnd_DnDConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DnDConstants;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DnDConstants : public ::java::lang::Object
-{
-
-  DnDConstants();
-public:
-  static const jint ACTION_NONE = 0;
-  static const jint ACTION_COPY = 1;
-  static const jint ACTION_MOVE = 2;
-  static const jint ACTION_COPY_OR_MOVE = 3;
-  static const jint ACTION_LINK = 1073741824;
-  static const jint ACTION_REFERENCE = 1073741824;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DnDConstants__
diff --git a/libjava/java/awt/dnd/DnDEventMulticaster.h b/libjava/java/awt/dnd/DnDEventMulticaster.h
deleted file mode 100644
index c70450f2565..00000000000
--- a/libjava/java/awt/dnd/DnDEventMulticaster.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DnDEventMulticaster__
-#define __java_awt_dnd_DnDEventMulticaster__
-
-#pragma interface
-
-#include <java/awt/AWTEventMulticaster.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DnDEventMulticaster;
-          class DragSourceListener;
-          class DragSourceMotionListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DnDEventMulticaster : public ::java::awt::AWTEventMulticaster
-{
-
-public: // actually protected
-  DnDEventMulticaster(::java::util::EventListener *, ::java::util::EventListener *);
-public:
-  static ::java::awt::dnd::DragSourceListener * add(::java::awt::dnd::DragSourceListener *, ::java::awt::dnd::DragSourceListener *);
-  static ::java::awt::dnd::DragSourceMotionListener * add(::java::awt::dnd::DragSourceMotionListener *, ::java::awt::dnd::DragSourceMotionListener *);
-  static ::java::awt::dnd::DragSourceListener * remove(::java::awt::dnd::DragSourceListener *, ::java::awt::dnd::DragSourceListener *);
-  static ::java::awt::dnd::DragSourceMotionListener * remove(::java::awt::dnd::DragSourceMotionListener *, ::java::awt::dnd::DragSourceMotionListener *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DnDEventMulticaster__
diff --git a/libjava/java/awt/dnd/DragGestureEvent.h b/libjava/java/awt/dnd/DragGestureEvent.h
deleted file mode 100644
index 7d34bc632dd..00000000000
--- a/libjava/java/awt/dnd/DragGestureEvent.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragGestureEvent__
-#define __java_awt_dnd_DragGestureEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Cursor;
-        class Image;
-        class Point;
-      namespace datatransfer
-      {
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureRecognizer;
-          class DragSource;
-          class DragSourceListener;
-      }
-      namespace event
-      {
-          class InputEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragGestureEvent : public ::java::util::EventObject
-{
-
-public:
-  DragGestureEvent(::java::awt::dnd::DragGestureRecognizer *, jint, ::java::awt::Point *, ::java::util::List *);
-  virtual ::java::awt::dnd::DragGestureRecognizer * getSourceAsDragGestureRecognizer();
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::awt::dnd::DragSource * getDragSource();
-  virtual ::java::awt::Point * getDragOrigin();
-  virtual ::java::util::Iterator * iterator();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual jint getDragAction();
-  virtual ::java::awt::event::InputEvent * getTriggerEvent();
-  virtual void startDrag(::java::awt::Cursor *, ::java::awt::datatransfer::Transferable *);
-  virtual void startDrag(::java::awt::Cursor *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-  virtual void startDrag(::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-private:
-  static const jlong serialVersionUID = 9080172649166731306LL;
-  ::java::awt::dnd::DragSource * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) dragSource;
-  ::java::awt::Component * component;
-  ::java::awt::Point * origin;
-  jint action;
-  ::java::util::List * events;
-  ::java::awt::dnd::DragGestureRecognizer * dgr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragGestureEvent__
diff --git a/libjava/java/awt/dnd/DragGestureListener.h b/libjava/java/awt/dnd/DragGestureListener.h
deleted file mode 100644
index 044956739c8..00000000000
--- a/libjava/java/awt/dnd/DragGestureListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragGestureListener__
-#define __java_awt_dnd_DragGestureListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragGestureListener : public ::java::lang::Object
-{
-
-public:
-  virtual void dragGestureRecognized(::java::awt::dnd::DragGestureEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_DragGestureListener__
diff --git a/libjava/java/awt/dnd/DragGestureRecognizer.h b/libjava/java/awt/dnd/DragGestureRecognizer.h
deleted file mode 100644
index 22e856d609d..00000000000
--- a/libjava/java/awt/dnd/DragGestureRecognizer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragGestureRecognizer__
-#define __java_awt_dnd_DragGestureRecognizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace dnd
-      {
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-      }
-      namespace event
-      {
-          class InputEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragGestureRecognizer : public ::java::lang::Object
-{
-
-public: // actually protected
-  DragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  DragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint);
-  DragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *);
-  DragGestureRecognizer(::java::awt::dnd::DragSource *);
-  virtual void registerListeners() = 0;
-  virtual void unregisterListeners() = 0;
-public:
-  virtual ::java::awt::dnd::DragSource * getDragSource();
-  virtual ::java::awt::Component * getComponent();
-  virtual void setComponent(::java::awt::Component *);
-  virtual jint getSourceActions();
-  virtual void setSourceActions(jint);
-  virtual ::java::awt::event::InputEvent * getTriggerEvent();
-  virtual void resetRecognizer();
-  virtual void addDragGestureListener(::java::awt::dnd::DragGestureListener *);
-  virtual void removeDragGestureListener(::java::awt::dnd::DragGestureListener *);
-public: // actually protected
-  virtual void fireDragGestureRecognized(jint, ::java::awt::Point *);
-  virtual void appendEvent(::java::awt::event::InputEvent *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 8996673345831063337LL;
-public: // actually protected
-  ::java::awt::dnd::DragSource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dragSource;
-  ::java::awt::Component * component;
-  ::java::awt::dnd::DragGestureListener * dragGestureListener;
-  jint sourceActions;
-  ::java::util::ArrayList * events;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragGestureRecognizer__
diff --git a/libjava/java/awt/dnd/DragSource.h b/libjava/java/awt/dnd/DragSource.h
deleted file mode 100644
index 8f4246e1e61..00000000000
--- a/libjava/java/awt/dnd/DragSource.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSource__
-#define __java_awt_dnd_DragSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Cursor;
-        class Image;
-        class Point;
-      namespace datatransfer
-      {
-          class FlavorMap;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-          class DragSourceContext;
-          class DragSourceListener;
-          class DragSourceMotionListener;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSource : public ::java::lang::Object
-{
-
-public:
-  DragSource();
-  static ::java::awt::dnd::DragSource * getDefaultDragSource();
-  static jboolean isDragImageSupported();
-  virtual void startDrag(::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *, ::java::awt::datatransfer::FlavorMap *);
-  virtual void startDrag(::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *, ::java::awt::datatransfer::FlavorMap *);
-  virtual void startDrag(::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-  virtual void startDrag(::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-public: // actually protected
-  virtual ::java::awt::dnd::DragSourceContext * createDragSourceContext(::java::awt::dnd::peer::DragSourceContextPeer *, ::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-public:
-  virtual ::java::awt::datatransfer::FlavorMap * getFlavorMap();
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDragGestureRecognizer(::java::lang::Class *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDefaultDragGestureRecognizer(::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual void addDragSourceListener(::java::awt::dnd::DragSourceListener *);
-  virtual void removeDragSourceListener(::java::awt::dnd::DragSourceListener *);
-  virtual JArray< ::java::awt::dnd::DragSourceListener * > * getDragSourceListeners();
-  virtual void addDragSourceMotionListener(::java::awt::dnd::DragSourceMotionListener *);
-  virtual void removeDragSourceMotionListener(::java::awt::dnd::DragSourceMotionListener *);
-  virtual JArray< ::java::awt::dnd::DragSourceMotionListener * > * getDragSourceMotionListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  static jint getDragThreshold();
-private:
-  static const jlong serialVersionUID = 6236096958971414066LL;
-public:
-  static ::java::awt::Cursor * DefaultCopyDrop;
-  static ::java::awt::Cursor * DefaultMoveDrop;
-  static ::java::awt::Cursor * DefaultLinkDrop;
-  static ::java::awt::Cursor * DefaultCopyNoDrop;
-  static ::java::awt::Cursor * DefaultMoveNoDrop;
-  static ::java::awt::Cursor * DefaultLinkNoDrop;
-private:
-  ::java::awt::datatransfer::FlavorMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) flavorMap;
-  ::java::awt::dnd::DragSourceListener * dragSourceListener;
-  ::java::awt::dnd::DragSourceMotionListener * dragSourceMotionListener;
-  static ::java::awt::dnd::DragSource * ds;
-  ::java::awt::dnd::peer::DragSourceContextPeer * peer;
-  ::java::awt::dnd::DragSourceContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSource__
diff --git a/libjava/java/awt/dnd/DragSourceAdapter.h b/libjava/java/awt/dnd/DragSourceAdapter.h
deleted file mode 100644
index c3a4177e6ae..00000000000
--- a/libjava/java/awt/dnd/DragSourceAdapter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceAdapter__
-#define __java_awt_dnd_DragSourceAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceAdapter;
-          class DragSourceDragEvent;
-          class DragSourceDropEvent;
-          class DragSourceEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceAdapter : public ::java::lang::Object
-{
-
-public:
-  DragSourceAdapter();
-  virtual void dragEnter(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragOver(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragMouseMoved(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DragSourceEvent *);
-  virtual void dragDropEnd(::java::awt::dnd::DragSourceDropEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceAdapter__
diff --git a/libjava/java/awt/dnd/DragSourceContext.h b/libjava/java/awt/dnd/DragSourceContext.h
deleted file mode 100644
index 1e4646729e4..00000000000
--- a/libjava/java/awt/dnd/DragSourceContext.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceContext__
-#define __java_awt_dnd_DragSourceContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Cursor;
-        class Image;
-        class Point;
-      namespace datatransfer
-      {
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragSource;
-          class DragSourceContext;
-          class DragSourceDragEvent;
-          class DragSourceDropEvent;
-          class DragSourceEvent;
-          class DragSourceListener;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceContext : public ::java::lang::Object
-{
-
-public:
-  DragSourceContext(::java::awt::dnd::peer::DragSourceContextPeer *, ::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-  virtual ::java::awt::dnd::DragSource * getDragSource();
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::awt::dnd::DragGestureEvent * getTrigger();
-  virtual jint getSourceActions();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void addDragSourceListener(::java::awt::dnd::DragSourceListener *);
-  virtual void removeDragSourceListener(::java::awt::dnd::DragSourceListener *);
-  virtual void transferablesFlavorsChanged();
-  virtual void dragEnter(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragOver(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DragSourceEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragDropEnd(::java::awt::dnd::DragSourceDropEvent *);
-  virtual void dragMouseMoved(::java::awt::dnd::DragSourceDragEvent *);
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-public: // actually protected
-  virtual void updateCurrentCursor(jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = -115407898692194719LL;
-public: // actually protected
-  static const jint DEFAULT = 0;
-  static const jint ENTER = 1;
-  static const jint OVER = 2;
-  static const jint CHANGED = 3;
-private:
-  ::java::awt::dnd::peer::DragSourceContextPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) peer;
-  ::java::awt::Cursor * cursor;
-  ::java::awt::datatransfer::Transferable * transferable;
-  ::java::awt::dnd::DragGestureEvent * trigger;
-  ::java::awt::dnd::DragSourceListener * dragSourceListener;
-  jboolean useCustomCursor;
-  jint sourceActions;
-  ::java::awt::Image * image;
-  ::java::awt::Point * offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceContext__
diff --git a/libjava/java/awt/dnd/DragSourceDragEvent.h b/libjava/java/awt/dnd/DragSourceDragEvent.h
deleted file mode 100644
index ec0c80eecbc..00000000000
--- a/libjava/java/awt/dnd/DragSourceDragEvent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceDragEvent__
-#define __java_awt_dnd_DragSourceDragEvent__
-
-#pragma interface
-
-#include <java/awt/dnd/DragSourceEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceContext;
-          class DragSourceDragEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceDragEvent : public ::java::awt::dnd::DragSourceEvent
-{
-
-public:
-  DragSourceDragEvent(::java::awt::dnd::DragSourceContext *, jint, jint, jint);
-  DragSourceDragEvent(::java::awt::dnd::DragSourceContext *, jint, jint, jint, jint, jint);
-  virtual jint getTargetActions();
-  virtual jint getGestureModifiers();
-  virtual jint getGestureModifiersEx();
-  virtual jint getUserAction();
-  virtual jint getDropAction();
-private:
-  static const jlong serialVersionUID = 481346297933902471LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::dnd::DragSourceEvent)))) dropAction;
-  jint targetActions;
-  jint gestureModifiers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceDragEvent__
diff --git a/libjava/java/awt/dnd/DragSourceDropEvent.h b/libjava/java/awt/dnd/DragSourceDropEvent.h
deleted file mode 100644
index bc3341f02e6..00000000000
--- a/libjava/java/awt/dnd/DragSourceDropEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceDropEvent__
-#define __java_awt_dnd_DragSourceDropEvent__
-
-#pragma interface
-
-#include <java/awt/dnd/DragSourceEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceContext;
-          class DragSourceDropEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceDropEvent : public ::java::awt::dnd::DragSourceEvent
-{
-
-public:
-  DragSourceDropEvent(::java::awt::dnd::DragSourceContext *);
-  DragSourceDropEvent(::java::awt::dnd::DragSourceContext *, jint, jboolean);
-  DragSourceDropEvent(::java::awt::dnd::DragSourceContext *, jint, jboolean, jint, jint);
-  virtual jint getDropAction();
-  virtual jboolean getDropSuccess();
-private:
-  static const jlong serialVersionUID = -5571321229470821891LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::dnd::DragSourceEvent)))) dropAction;
-  jboolean dropSuccess;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceDropEvent__
diff --git a/libjava/java/awt/dnd/DragSourceEvent.h b/libjava/java/awt/dnd/DragSourceEvent.h
deleted file mode 100644
index 0d008a19ccf..00000000000
--- a/libjava/java/awt/dnd/DragSourceEvent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceEvent__
-#define __java_awt_dnd_DragSourceEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace dnd
-      {
-          class DragSourceContext;
-          class DragSourceEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceEvent : public ::java::util::EventObject
-{
-
-public:
-  DragSourceEvent(::java::awt::dnd::DragSourceContext *);
-  DragSourceEvent(::java::awt::dnd::DragSourceContext *, jint, jint);
-  virtual ::java::awt::dnd::DragSourceContext * getDragSourceContext();
-  virtual ::java::awt::Point * getLocation();
-  virtual jint getX();
-  virtual jint getY();
-private:
-  static const jlong serialVersionUID = -763287114604032641LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::util::EventObject)))) locationSpecified;
-  jint x;
-  jint y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceEvent__
diff --git a/libjava/java/awt/dnd/DragSourceListener.h b/libjava/java/awt/dnd/DragSourceListener.h
deleted file mode 100644
index fc845501a2e..00000000000
--- a/libjava/java/awt/dnd/DragSourceListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceListener__
-#define __java_awt_dnd_DragSourceListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceDragEvent;
-          class DragSourceDropEvent;
-          class DragSourceEvent;
-          class DragSourceListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceListener : public ::java::lang::Object
-{
-
-public:
-  virtual void dragEnter(::java::awt::dnd::DragSourceDragEvent *) = 0;
-  virtual void dragOver(::java::awt::dnd::DragSourceDragEvent *) = 0;
-  virtual void dropActionChanged(::java::awt::dnd::DragSourceDragEvent *) = 0;
-  virtual void dragExit(::java::awt::dnd::DragSourceEvent *) = 0;
-  virtual void dragDropEnd(::java::awt::dnd::DragSourceDropEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_DragSourceListener__
diff --git a/libjava/java/awt/dnd/DragSourceMotionListener.h b/libjava/java/awt/dnd/DragSourceMotionListener.h
deleted file mode 100644
index 0db0603b266..00000000000
--- a/libjava/java/awt/dnd/DragSourceMotionListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceMotionListener__
-#define __java_awt_dnd_DragSourceMotionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceDragEvent;
-          class DragSourceMotionListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceMotionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void dragMouseMoved(::java::awt::dnd::DragSourceDragEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_DragSourceMotionListener__
diff --git a/libjava/java/awt/dnd/DropTarget$DropTargetAutoScroller.h b/libjava/java/awt/dnd/DropTarget$DropTargetAutoScroller.h
deleted file mode 100644
index cb72a909ff9..00000000000
--- a/libjava/java/awt/dnd/DropTarget$DropTargetAutoScroller.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTarget$DropTargetAutoScroller__
-#define __java_awt_dnd_DropTarget$DropTargetAutoScroller__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-        class Rectangle;
-      namespace dnd
-      {
-          class DropTarget$DropTargetAutoScroller;
-      }
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-    }
-  }
-}
-
-class java::awt::dnd::DropTarget$DropTargetAutoScroller : public ::java::lang::Object
-{
-
-public: // actually protected
-  DropTarget$DropTargetAutoScroller(::java::awt::Component *, ::java::awt::Point *);
-  virtual void updateLocation(::java::awt::Point *);
-  virtual void stop();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  static const jint HYSTERESIS = 10;
-  static const jint DELAY = 100;
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
-  ::java::awt::Point * point;
-  ::javax::swing::Timer * timer;
-  ::java::awt::Rectangle * outer;
-  ::java::awt::Rectangle * inner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTarget$DropTargetAutoScroller__
diff --git a/libjava/java/awt/dnd/DropTarget.h b/libjava/java/awt/dnd/DropTarget.h
deleted file mode 100644
index 399889a9542..00000000000
--- a/libjava/java/awt/dnd/DropTarget.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTarget__
-#define __java_awt_dnd_DropTarget__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace datatransfer
-      {
-          class FlavorMap;
-      }
-      namespace dnd
-      {
-          class DropTarget;
-          class DropTarget$DropTargetAutoScroller;
-          class DropTargetContext;
-          class DropTargetDragEvent;
-          class DropTargetDropEvent;
-          class DropTargetEvent;
-          class DropTargetListener;
-        namespace peer
-        {
-            class DropTargetPeer;
-        }
-      }
-      namespace peer
-      {
-          class ComponentPeer;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTarget : public ::java::lang::Object
-{
-
-public:
-  DropTarget();
-  DropTarget(::java::awt::Component *, ::java::awt::dnd::DropTargetListener *);
-  DropTarget(::java::awt::Component *, jint, ::java::awt::dnd::DropTargetListener *);
-  DropTarget(::java::awt::Component *, jint, ::java::awt::dnd::DropTargetListener *, jboolean);
-  DropTarget(::java::awt::Component *, jint, ::java::awt::dnd::DropTargetListener *, jboolean, ::java::awt::datatransfer::FlavorMap *);
-  virtual void setComponent(::java::awt::Component *);
-  virtual ::java::awt::Component * getComponent();
-  virtual void setDefaultActions(jint);
-  virtual jint getDefaultActions();
-  virtual void setActive(jboolean);
-  virtual jboolean isActive();
-  virtual void addDropTargetListener(::java::awt::dnd::DropTargetListener *);
-  virtual void removeDropTargetListener(::java::awt::dnd::DropTargetListener *);
-  virtual void dragEnter(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dragOver(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DropTargetEvent *);
-  virtual void drop(::java::awt::dnd::DropTargetDropEvent *);
-  virtual ::java::awt::datatransfer::FlavorMap * getFlavorMap();
-  virtual void setFlavorMap(::java::awt::datatransfer::FlavorMap *);
-  virtual void addNotify(::java::awt::peer::ComponentPeer *);
-  virtual void removeNotify(::java::awt::peer::ComponentPeer *);
-  virtual ::java::awt::dnd::DropTargetContext * getDropTargetContext();
-public: // actually protected
-  virtual ::java::awt::dnd::DropTargetContext * createDropTargetContext();
-  virtual ::java::awt::dnd::DropTarget$DropTargetAutoScroller * createDropTargetAutoScroller(::java::awt::Component *, ::java::awt::Point *);
-  virtual void initializeAutoscrolling(::java::awt::Point *);
-  virtual void updateAutoscroll(::java::awt::Point *);
-  virtual void clearAutoscroll();
-private:
-  static const jlong serialVersionUID = -6283860791671019047LL;
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
-  ::java::awt::datatransfer::FlavorMap * flavorMap;
-  jint actions;
-  ::java::awt::dnd::peer::DropTargetPeer * peer;
-  ::java::awt::dnd::DropTargetContext * dropTargetContext;
-  ::java::awt::dnd::DropTargetListener * dropTargetListener;
-  ::java::awt::dnd::DropTarget$DropTargetAutoScroller * autoscroller;
-  jboolean active;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTarget__
diff --git a/libjava/java/awt/dnd/DropTargetAdapter.h b/libjava/java/awt/dnd/DropTargetAdapter.h
deleted file mode 100644
index 34f4f5b669b..00000000000
--- a/libjava/java/awt/dnd/DropTargetAdapter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetAdapter__
-#define __java_awt_dnd_DropTargetAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTargetAdapter;
-          class DropTargetDragEvent;
-          class DropTargetDropEvent;
-          class DropTargetEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetAdapter : public ::java::lang::Object
-{
-
-public:
-  DropTargetAdapter();
-  virtual void dragEnter(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dragOver(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DropTargetEvent *);
-  virtual void drop(::java::awt::dnd::DropTargetDropEvent *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetAdapter__
diff --git a/libjava/java/awt/dnd/DropTargetContext$TransferableProxy.h b/libjava/java/awt/dnd/DropTargetContext$TransferableProxy.h
deleted file mode 100644
index e670c079d12..00000000000
--- a/libjava/java/awt/dnd/DropTargetContext$TransferableProxy.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetContext$TransferableProxy__
-#define __java_awt_dnd_DropTargetContext$TransferableProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTargetContext;
-          class DropTargetContext$TransferableProxy;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetContext$TransferableProxy : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DropTargetContext$TransferableProxy(::java::awt::dnd::DropTargetContext *, ::java::awt::datatransfer::Transferable *, jboolean);
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isLocal;
-  ::java::awt::datatransfer::Transferable * transferable;
-public: // actually package-private
-  ::java::awt::dnd::DropTargetContext * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetContext$TransferableProxy__
diff --git a/libjava/java/awt/dnd/DropTargetContext.h b/libjava/java/awt/dnd/DropTargetContext.h
deleted file mode 100644
index f6ea29be31d..00000000000
--- a/libjava/java/awt/dnd/DropTargetContext.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetContext__
-#define __java_awt_dnd_DropTargetContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTarget;
-          class DropTargetContext;
-        namespace peer
-        {
-            class DropTargetContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DropTargetContext(::java::awt::dnd::DropTarget *);
-public:
-  virtual ::java::awt::dnd::DropTarget * getDropTarget();
-  virtual ::java::awt::Component * getComponent();
-  virtual void addNotify(::java::awt::dnd::peer::DropTargetContextPeer *);
-  virtual void removeNotify();
-public: // actually protected
-  virtual void setTargetActions(jint);
-  virtual jint getTargetActions();
-public:
-  virtual void dropComplete(jboolean);
-public: // actually protected
-  virtual void acceptDrag(jint);
-  virtual void rejectDrag();
-  virtual void acceptDrop(jint);
-  virtual void rejectDrop();
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getCurrentDataFlavors();
-  virtual ::java::util::List * getCurrentDataFlavorsAsList();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-  virtual ::java::awt::datatransfer::Transferable * createTransferableProxy(::java::awt::datatransfer::Transferable *, jboolean);
-public: // actually package-private
-  static const jlong serialVersionUID = -634158968993743371LL;
-private:
-  ::java::awt::dnd::DropTarget * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dropTarget;
-  jint targetActions;
-  ::java::awt::dnd::peer::DropTargetContextPeer * dtcp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetContext__
diff --git a/libjava/java/awt/dnd/DropTargetDragEvent.h b/libjava/java/awt/dnd/DropTargetDragEvent.h
deleted file mode 100644
index d25da60043f..00000000000
--- a/libjava/java/awt/dnd/DropTargetDragEvent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetDragEvent__
-#define __java_awt_dnd_DropTargetDragEvent__
-
-#pragma interface
-
-#include <java/awt/dnd/DropTargetEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTargetContext;
-          class DropTargetDragEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetDragEvent : public ::java::awt::dnd::DropTargetEvent
-{
-
-public:
-  DropTargetDragEvent(::java::awt::dnd::DropTargetContext *, ::java::awt::Point *, jint, jint);
-  virtual void acceptDrag(jint);
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getCurrentDataFlavors();
-  virtual ::java::util::List * getCurrentDataFlavorsAsList();
-  virtual jint getDropAction();
-  virtual ::java::awt::Point * getLocation();
-  virtual jint getSourceActions();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual void rejectDrag();
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-private:
-  static const jlong serialVersionUID = -8422265619058953682LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::dnd::DropTargetEvent)))) dropAction;
-  jint srcActions;
-  ::java::awt::Point * location;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetDragEvent__
diff --git a/libjava/java/awt/dnd/DropTargetDropEvent.h b/libjava/java/awt/dnd/DropTargetDropEvent.h
deleted file mode 100644
index 08851b68cf4..00000000000
--- a/libjava/java/awt/dnd/DropTargetDropEvent.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetDropEvent__
-#define __java_awt_dnd_DropTargetDropEvent__
-
-#pragma interface
-
-#include <java/awt/dnd/DropTargetEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTargetContext;
-          class DropTargetDropEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetDropEvent : public ::java::awt::dnd::DropTargetEvent
-{
-
-public:
-  DropTargetDropEvent(::java::awt::dnd::DropTargetContext *, ::java::awt::Point *, jint, jint);
-  DropTargetDropEvent(::java::awt::dnd::DropTargetContext *, ::java::awt::Point *, jint, jint, jboolean);
-  virtual ::java::awt::Point * getLocation();
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getCurrentDataFlavors();
-  virtual ::java::util::List * getCurrentDataFlavorsAsList();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual jint getSourceActions();
-  virtual jint getDropAction();
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-  virtual void acceptDrop(jint);
-  virtual void rejectDrop();
-  virtual void dropComplete(jboolean);
-  virtual jboolean isLocalTransfer();
-private:
-  static const jlong serialVersionUID = -1721911170440459322LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::dnd::DropTargetEvent)))) dropAction;
-  jint actions;
-  ::java::awt::Point * location;
-  jboolean isLocalTx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetDropEvent__
diff --git a/libjava/java/awt/dnd/DropTargetEvent.h b/libjava/java/awt/dnd/DropTargetEvent.h
deleted file mode 100644
index e090e197c1d..00000000000
--- a/libjava/java/awt/dnd/DropTargetEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetEvent__
-#define __java_awt_dnd_DropTargetEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTargetContext;
-          class DropTargetEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetEvent : public ::java::util::EventObject
-{
-
-public:
-  DropTargetEvent(::java::awt::dnd::DropTargetContext *);
-  virtual ::java::awt::dnd::DropTargetContext * getDropTargetContext();
-private:
-  static const jlong serialVersionUID = 2821229066521922993LL;
-public: // actually protected
-  ::java::awt::dnd::DropTargetContext * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetEvent__
diff --git a/libjava/java/awt/dnd/DropTargetListener.h b/libjava/java/awt/dnd/DropTargetListener.h
deleted file mode 100644
index 83aba62d160..00000000000
--- a/libjava/java/awt/dnd/DropTargetListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetListener__
-#define __java_awt_dnd_DropTargetListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTargetDragEvent;
-          class DropTargetDropEvent;
-          class DropTargetEvent;
-          class DropTargetListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetListener : public ::java::lang::Object
-{
-
-public:
-  virtual void dragEnter(::java::awt::dnd::DropTargetDragEvent *) = 0;
-  virtual void dragOver(::java::awt::dnd::DropTargetDragEvent *) = 0;
-  virtual void dropActionChanged(::java::awt::dnd::DropTargetDragEvent *) = 0;
-  virtual void dragExit(::java::awt::dnd::DropTargetEvent *) = 0;
-  virtual void drop(::java::awt::dnd::DropTargetDropEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_DropTargetListener__
diff --git a/libjava/java/awt/dnd/InvalidDnDOperationException.h b/libjava/java/awt/dnd/InvalidDnDOperationException.h
deleted file mode 100644
index 674f7ce2dfe..00000000000
--- a/libjava/java/awt/dnd/InvalidDnDOperationException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_InvalidDnDOperationException__
-#define __java_awt_dnd_InvalidDnDOperationException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class InvalidDnDOperationException;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::InvalidDnDOperationException : public ::java::lang::IllegalStateException
-{
-
-public:
-  InvalidDnDOperationException();
-  InvalidDnDOperationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -6062568741193956678LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_InvalidDnDOperationException__
diff --git a/libjava/java/awt/dnd/MouseDragGestureRecognizer.h b/libjava/java/awt/dnd/MouseDragGestureRecognizer.h
deleted file mode 100644
index 00635da56d7..00000000000
--- a/libjava/java/awt/dnd/MouseDragGestureRecognizer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_MouseDragGestureRecognizer__
-#define __java_awt_dnd_MouseDragGestureRecognizer__
-
-#pragma interface
-
-#include <java/awt/dnd/DragGestureRecognizer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace dnd
-      {
-          class DragGestureListener;
-          class DragSource;
-          class MouseDragGestureRecognizer;
-      }
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::MouseDragGestureRecognizer : public ::java::awt::dnd::DragGestureRecognizer
-{
-
-public: // actually protected
-  MouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  MouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint);
-  MouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *);
-  MouseDragGestureRecognizer(::java::awt::dnd::DragSource *);
-  virtual void registerListeners();
-  virtual void unregisterListeners();
-public:
-  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 *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_MouseDragGestureRecognizer__
diff --git a/libjava/java/awt/dnd/peer/DragSourceContextPeer.h b/libjava/java/awt/dnd/peer/DragSourceContextPeer.h
deleted file mode 100644
index f5653f26034..00000000000
--- a/libjava/java/awt/dnd/peer/DragSourceContextPeer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_peer_DragSourceContextPeer__
-#define __java_awt_dnd_peer_DragSourceContextPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Cursor;
-        class Image;
-        class Point;
-      namespace dnd
-      {
-          class DragSourceContext;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::peer::DragSourceContextPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void startDrag(::java::awt::dnd::DragSourceContext *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *) = 0;
-  virtual ::java::awt::Cursor * getCursor() = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void transferablesFlavorsChanged() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_peer_DragSourceContextPeer__
diff --git a/libjava/java/awt/dnd/peer/DropTargetContextPeer.h b/libjava/java/awt/dnd/peer/DropTargetContextPeer.h
deleted file mode 100644
index cb7ae0d655e..00000000000
--- a/libjava/java/awt/dnd/peer/DropTargetContextPeer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_peer_DropTargetContextPeer__
-#define __java_awt_dnd_peer_DropTargetContextPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTarget;
-        namespace peer
-        {
-            class DropTargetContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::peer::DropTargetContextPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setTargetActions(jint) = 0;
-  virtual jint getTargetActions() = 0;
-  virtual ::java::awt::dnd::DropTarget * getDropTarget() = 0;
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors() = 0;
-  virtual ::java::awt::datatransfer::Transferable * getTransferable() = 0;
-  virtual jboolean isTransferableJVMLocal() = 0;
-  virtual void acceptDrag(jint) = 0;
-  virtual void rejectDrag() = 0;
-  virtual void acceptDrop(jint) = 0;
-  virtual void rejectDrop() = 0;
-  virtual void dropComplete(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_peer_DropTargetContextPeer__
diff --git a/libjava/java/awt/dnd/peer/DropTargetPeer.h b/libjava/java/awt/dnd/peer/DropTargetPeer.h
deleted file mode 100644
index d96222ba87a..00000000000
--- a/libjava/java/awt/dnd/peer/DropTargetPeer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_peer_DropTargetPeer__
-#define __java_awt_dnd_peer_DropTargetPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTarget;
-        namespace peer
-        {
-            class DropTargetPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::peer::DropTargetPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void addDropTarget(::java::awt::dnd::DropTarget *) = 0;
-  virtual void removeDropTarget(::java::awt::dnd::DropTarget *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_peer_DropTargetPeer__
diff --git a/libjava/java/awt/event/AWTEventListener.h b/libjava/java/awt/event/AWTEventListener.h
deleted file mode 100644
index e85da18c51e..00000000000
--- a/libjava/java/awt/event/AWTEventListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_AWTEventListener__
-#define __java_awt_event_AWTEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-      namespace event
-      {
-          class AWTEventListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::AWTEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void eventDispatched(::java::awt::AWTEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_AWTEventListener__
diff --git a/libjava/java/awt/event/AWTEventListenerProxy.h b/libjava/java/awt/event/AWTEventListenerProxy.h
deleted file mode 100644
index 90e1bc2d939..00000000000
--- a/libjava/java/awt/event/AWTEventListenerProxy.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_AWTEventListenerProxy__
-#define __java_awt_event_AWTEventListenerProxy__
-
-#pragma interface
-
-#include <java/util/EventListenerProxy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-      namespace event
-      {
-          class AWTEventListener;
-          class AWTEventListenerProxy;
-      }
-    }
-  }
-}
-
-class java::awt::event::AWTEventListenerProxy : public ::java::util::EventListenerProxy
-{
-
-public:
-  AWTEventListenerProxy(jlong, ::java::awt::event::AWTEventListener *);
-  virtual void eventDispatched(::java::awt::AWTEvent *);
-  virtual jlong getEventMask();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::util::EventListenerProxy)))) mask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_AWTEventListenerProxy__
diff --git a/libjava/java/awt/event/ActionEvent.h b/libjava/java/awt/event/ActionEvent.h
deleted file mode 100644
index a1eff263223..00000000000
--- a/libjava/java/awt/event/ActionEvent.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ActionEvent__
-#define __java_awt_event_ActionEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ActionEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  ActionEvent(::java::lang::Object *, jint, ::java::lang::String *);
-  ActionEvent(::java::lang::Object *, jint, ::java::lang::String *, jint);
-  ActionEvent(::java::lang::Object *, jint, ::java::lang::String *, jlong, jint);
-  virtual ::java::lang::String * getActionCommand();
-  virtual jlong getWhen();
-  virtual jint getModifiers();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -7671078796273832149LL;
-public:
-  static const jint SHIFT_MASK = 1;
-  static const jint CTRL_MASK = 2;
-  static const jint META_MASK = 4;
-  static const jint ALT_MASK = 8;
-  static const jint ACTION_FIRST = 1001;
-  static const jint ACTION_LAST = 1001;
-  static const jint ACTION_PERFORMED = 1001;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) actionCommand;
-  jint modifiers;
-  jlong when;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ActionEvent__
diff --git a/libjava/java/awt/event/ActionListener.h b/libjava/java/awt/event/ActionListener.h
deleted file mode 100644
index 0560d7caf56..00000000000
--- a/libjava/java/awt/event/ActionListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ActionListener__
-#define __java_awt_event_ActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::ActionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_ActionListener__
diff --git a/libjava/java/awt/event/AdjustmentEvent.h b/libjava/java/awt/event/AdjustmentEvent.h
deleted file mode 100644
index 71bef4d3949..00000000000
--- a/libjava/java/awt/event/AdjustmentEvent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_AdjustmentEvent__
-#define __java_awt_event_AdjustmentEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-      namespace event
-      {
-          class AdjustmentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::AdjustmentEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  AdjustmentEvent(::java::awt::Adjustable *, jint, jint, jint);
-  AdjustmentEvent(::java::awt::Adjustable *, jint, jint, jint, jboolean);
-  virtual ::java::awt::Adjustable * getAdjustable();
-  virtual jint getValue();
-  virtual jint getAdjustmentType();
-  virtual jboolean getValueIsAdjusting();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 5700290645205279921LL;
-public:
-  static const jint ADJUSTMENT_FIRST = 601;
-  static const jint ADJUSTMENT_LAST = 601;
-  static const jint ADJUSTMENT_VALUE_CHANGED = 601;
-  static const jint UNIT_INCREMENT = 1;
-  static const jint UNIT_DECREMENT = 2;
-  static const jint BLOCK_DECREMENT = 3;
-  static const jint BLOCK_INCREMENT = 4;
-  static const jint TRACK = 5;
-private:
-  ::java::awt::Adjustable * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) adjustable;
-  jint adjustmentType;
-  jint value;
-  jboolean isAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_AdjustmentEvent__
diff --git a/libjava/java/awt/event/AdjustmentListener.h b/libjava/java/awt/event/AdjustmentListener.h
deleted file mode 100644
index 75e67203b25..00000000000
--- a/libjava/java/awt/event/AdjustmentListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_AdjustmentListener__
-#define __java_awt_event_AdjustmentListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class AdjustmentEvent;
-          class AdjustmentListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::AdjustmentListener : public ::java::lang::Object
-{
-
-public:
-  virtual void adjustmentValueChanged(::java::awt::event::AdjustmentEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_AdjustmentListener__
diff --git a/libjava/java/awt/event/ComponentAdapter.h b/libjava/java/awt/event/ComponentAdapter.h
deleted file mode 100644
index 0121a0de596..00000000000
--- a/libjava/java/awt/event/ComponentAdapter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ComponentAdapter__
-#define __java_awt_event_ComponentAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentAdapter;
-          class ComponentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ComponentAdapter : public ::java::lang::Object
-{
-
-public:
-  ComponentAdapter();
-  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 *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ComponentAdapter__
diff --git a/libjava/java/awt/event/ComponentEvent.h b/libjava/java/awt/event/ComponentEvent.h
deleted file mode 100644
index 667ceb7c21e..00000000000
--- a/libjava/java/awt/event/ComponentEvent.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ComponentEvent__
-#define __java_awt_event_ComponentEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ComponentEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  ComponentEvent(::java::awt::Component *, jint);
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 8101406823902992965LL;
-public:
-  static const jint COMPONENT_FIRST = 100;
-  static const jint COMPONENT_LAST = 103;
-  static const jint COMPONENT_MOVED = 100;
-  static const jint COMPONENT_RESIZED = 101;
-  static const jint COMPONENT_SHOWN = 102;
-  static const jint COMPONENT_HIDDEN = 103;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ComponentEvent__
diff --git a/libjava/java/awt/event/ComponentListener.h b/libjava/java/awt/event/ComponentListener.h
deleted file mode 100644
index 961c9a9d306..00000000000
--- a/libjava/java/awt/event/ComponentListener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ComponentListener__
-#define __java_awt_event_ComponentListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-          class ComponentListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::ComponentListener : public ::java::lang::Object
-{
-
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *) = 0;
-  virtual void componentMoved(::java::awt::event::ComponentEvent *) = 0;
-  virtual void componentShown(::java::awt::event::ComponentEvent *) = 0;
-  virtual void componentHidden(::java::awt::event::ComponentEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_ComponentListener__
diff --git a/libjava/java/awt/event/ContainerAdapter.h b/libjava/java/awt/event/ContainerAdapter.h
deleted file mode 100644
index e483c5b0e75..00000000000
--- a/libjava/java/awt/event/ContainerAdapter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ContainerAdapter__
-#define __java_awt_event_ContainerAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerAdapter;
-          class ContainerEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ContainerAdapter : public ::java::lang::Object
-{
-
-public:
-  ContainerAdapter();
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ContainerAdapter__
diff --git a/libjava/java/awt/event/ContainerEvent.h b/libjava/java/awt/event/ContainerEvent.h
deleted file mode 100644
index f1d4680ef2c..00000000000
--- a/libjava/java/awt/event/ContainerEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ContainerEvent__
-#define __java_awt_event_ContainerEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ContainerEvent : public ::java::awt::event::ComponentEvent
-{
-
-public:
-  ContainerEvent(::java::awt::Component *, jint, ::java::awt::Component *);
-  virtual ::java::awt::Container * getContainer();
-  virtual ::java::awt::Component * getChild();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -4114942250539772041LL;
-public:
-  static const jint CONTAINER_FIRST = 300;
-  static const jint CONTAINER_LAST = 301;
-  static const jint COMPONENT_ADDED = 300;
-  static const jint COMPONENT_REMOVED = 301;
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) child;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ContainerEvent__
diff --git a/libjava/java/awt/event/ContainerListener.h b/libjava/java/awt/event/ContainerListener.h
deleted file mode 100644
index ac24d8ce019..00000000000
--- a/libjava/java/awt/event/ContainerListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ContainerListener__
-#define __java_awt_event_ContainerListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-          class ContainerListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::ContainerListener : public ::java::lang::Object
-{
-
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *) = 0;
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_ContainerListener__
diff --git a/libjava/java/awt/event/FocusAdapter.h b/libjava/java/awt/event/FocusAdapter.h
deleted file mode 100644
index f46f94e5c4f..00000000000
--- a/libjava/java/awt/event/FocusAdapter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_FocusAdapter__
-#define __java_awt_event_FocusAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusAdapter;
-          class FocusEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::FocusAdapter : public ::java::lang::Object
-{
-
-public:
-  FocusAdapter();
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_FocusAdapter__
diff --git a/libjava/java/awt/event/FocusEvent.h b/libjava/java/awt/event/FocusEvent.h
deleted file mode 100644
index 5c7315a9a5a..00000000000
--- a/libjava/java/awt/event/FocusEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_FocusEvent__
-#define __java_awt_event_FocusEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::FocusEvent : public ::java::awt::event::ComponentEvent
-{
-
-public:
-  FocusEvent(::java::awt::Component *, jint, jboolean, ::java::awt::Component *);
-  FocusEvent(::java::awt::Component *, jint, jboolean);
-  FocusEvent(::java::awt::Component *, jint);
-  virtual jboolean isTemporary();
-  virtual ::java::awt::Component * getOppositeComponent();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 523753786457416396LL;
-public:
-  static const jint FOCUS_FIRST = 1004;
-  static const jint FOCUS_LAST = 1005;
-  static const jint FOCUS_GAINED = 1004;
-  static const jint FOCUS_LOST = 1005;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) temporary;
-  ::java::awt::Component * opposite;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_FocusEvent__
diff --git a/libjava/java/awt/event/FocusListener.h b/libjava/java/awt/event/FocusListener.h
deleted file mode 100644
index f47a924b332..00000000000
--- a/libjava/java/awt/event/FocusListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_FocusListener__
-#define __java_awt_event_FocusListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-          class FocusListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::FocusListener : public ::java::lang::Object
-{
-
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *) = 0;
-  virtual void focusLost(::java::awt::event::FocusEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_FocusListener__
diff --git a/libjava/java/awt/event/HierarchyBoundsAdapter.h b/libjava/java/awt/event/HierarchyBoundsAdapter.h
deleted file mode 100644
index 125cf864cd8..00000000000
--- a/libjava/java/awt/event/HierarchyBoundsAdapter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_HierarchyBoundsAdapter__
-#define __java_awt_event_HierarchyBoundsAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class HierarchyBoundsAdapter;
-          class HierarchyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::HierarchyBoundsAdapter : public ::java::lang::Object
-{
-
-public:
-  HierarchyBoundsAdapter();
-  virtual void ancestorMoved(::java::awt::event::HierarchyEvent *);
-  virtual void ancestorResized(::java::awt::event::HierarchyEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_HierarchyBoundsAdapter__
diff --git a/libjava/java/awt/event/HierarchyBoundsListener.h b/libjava/java/awt/event/HierarchyBoundsListener.h
deleted file mode 100644
index 2ae05003f3e..00000000000
--- a/libjava/java/awt/event/HierarchyBoundsListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_HierarchyBoundsListener__
-#define __java_awt_event_HierarchyBoundsListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class HierarchyBoundsListener;
-          class HierarchyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::HierarchyBoundsListener : public ::java::lang::Object
-{
-
-public:
-  virtual void ancestorMoved(::java::awt::event::HierarchyEvent *) = 0;
-  virtual void ancestorResized(::java::awt::event::HierarchyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_HierarchyBoundsListener__
diff --git a/libjava/java/awt/event/HierarchyEvent.h b/libjava/java/awt/event/HierarchyEvent.h
deleted file mode 100644
index fe9585ae0a7..00000000000
--- a/libjava/java/awt/event/HierarchyEvent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_HierarchyEvent__
-#define __java_awt_event_HierarchyEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-      namespace event
-      {
-          class HierarchyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::HierarchyEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  HierarchyEvent(::java::awt::Component *, jint, ::java::awt::Component *, ::java::awt::Container *);
-  HierarchyEvent(::java::awt::Component *, jint, ::java::awt::Component *, ::java::awt::Container *, jlong);
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::awt::Component * getChanged();
-  virtual ::java::awt::Container * getChangedParent();
-  virtual jlong getChangeFlags();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -5337576970038043990LL;
-public:
-  static const jint HIERARCHY_FIRST = 1400;
-  static const jint HIERARCHY_CHANGED = 1400;
-  static const jint ANCESTOR_MOVED = 1401;
-  static const jint ANCESTOR_RESIZED = 1402;
-  static const jint HIERARCHY_LAST = 1402;
-  static const jint PARENT_CHANGED = 1;
-  static const jint DISPLAYABILITY_CHANGED = 2;
-  static const jint SHOWING_CHANGED = 4;
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) changed;
-  ::java::awt::Container * changedParent;
-  jlong changeFlags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_HierarchyEvent__
diff --git a/libjava/java/awt/event/HierarchyListener.h b/libjava/java/awt/event/HierarchyListener.h
deleted file mode 100644
index e691edc2782..00000000000
--- a/libjava/java/awt/event/HierarchyListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_HierarchyListener__
-#define __java_awt_event_HierarchyListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class HierarchyEvent;
-          class HierarchyListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::HierarchyListener : public ::java::lang::Object
-{
-
-public:
-  virtual void hierarchyChanged(::java::awt::event::HierarchyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_HierarchyListener__
diff --git a/libjava/java/awt/event/InputEvent.h b/libjava/java/awt/event/InputEvent.h
deleted file mode 100644
index 863963ca05c..00000000000
--- a/libjava/java/awt/event/InputEvent.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_InputEvent__
-#define __java_awt_event_InputEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class InputEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::InputEvent : public ::java::awt::event::ComponentEvent
-{
-
-public: // actually package-private
-  InputEvent(::java::awt::Component *, jint, jlong, jint);
-public:
-  virtual jboolean isShiftDown();
-  virtual jboolean isControlDown();
-  virtual jboolean isMetaDown();
-  virtual jboolean isAltDown();
-  virtual jboolean isAltGraphDown();
-  virtual jlong getWhen();
-  virtual jint getModifiers();
-  virtual jint getModifiersEx();
-  virtual void consume();
-  virtual jboolean isConsumed();
-  static ::java::lang::String * getModifiersExText(jint);
-private:
-  static const jlong serialVersionUID = -2482525981698309786LL;
-public:
-  static const jint SHIFT_MASK = 1;
-  static const jint CTRL_MASK = 2;
-  static const jint META_MASK = 4;
-  static const jint ALT_MASK = 8;
-  static const jint ALT_GRAPH_MASK = 32;
-  static const jint BUTTON1_MASK = 16;
-  static const jint BUTTON2_MASK = 8;
-  static const jint BUTTON3_MASK = 4;
-  static const jint SHIFT_DOWN_MASK = 64;
-  static const jint CTRL_DOWN_MASK = 128;
-  static const jint META_DOWN_MASK = 256;
-  static const jint ALT_DOWN_MASK = 512;
-  static const jint BUTTON1_DOWN_MASK = 1024;
-  static const jint BUTTON2_DOWN_MASK = 2048;
-  static const jint BUTTON3_DOWN_MASK = 4096;
-  static const jint ALT_GRAPH_DOWN_MASK = 8192;
-public: // actually package-private
-  static const jint CONVERT_MASK = 10176;
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) when;
-public: // actually package-private
-  jint modifiers;
-  jint modifiersEx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_InputEvent__
diff --git a/libjava/java/awt/event/InputMethodEvent.h b/libjava/java/awt/event/InputMethodEvent.h
deleted file mode 100644
index 0c02470459f..00000000000
--- a/libjava/java/awt/event/InputMethodEvent.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_InputMethodEvent__
-#define __java_awt_event_InputMethodEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class InputMethodEvent;
-      }
-      namespace font
-      {
-          class TextHitInfo;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class java::awt::event::InputMethodEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  InputMethodEvent(::java::awt::Component *, jint, jlong, ::java::text::AttributedCharacterIterator *, jint, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  InputMethodEvent(::java::awt::Component *, jint, ::java::text::AttributedCharacterIterator *, jint, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  InputMethodEvent(::java::awt::Component *, jint, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  virtual ::java::text::AttributedCharacterIterator * getText();
-  virtual jint getCommittedCharacterCount();
-  virtual ::java::awt::font::TextHitInfo * getCaret();
-  virtual ::java::awt::font::TextHitInfo * getVisiblePosition();
-  virtual void consume();
-  virtual jboolean isConsumed();
-  virtual jlong getWhen();
-  virtual ::java::lang::String * paramString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 4727190874778922661LL;
-public:
-  static const jint INPUT_METHOD_FIRST = 1100;
-  static const jint INPUT_METHOD_TEXT_CHANGED = 1100;
-  static const jint CARET_POSITION_CHANGED = 1101;
-  static const jint INPUT_METHOD_LAST = 1101;
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) when;
-  ::java::text::AttributedCharacterIterator * text;
-  jint committedCharacterCount;
-  ::java::awt::font::TextHitInfo * caret;
-  ::java::awt::font::TextHitInfo * visiblePosition;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_InputMethodEvent__
diff --git a/libjava/java/awt/event/InputMethodListener.h b/libjava/java/awt/event/InputMethodListener.h
deleted file mode 100644
index 4bb03de2b06..00000000000
--- a/libjava/java/awt/event/InputMethodListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_InputMethodListener__
-#define __java_awt_event_InputMethodListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class InputMethodEvent;
-          class InputMethodListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::InputMethodListener : public ::java::lang::Object
-{
-
-public:
-  virtual void inputMethodTextChanged(::java::awt::event::InputMethodEvent *) = 0;
-  virtual void caretPositionChanged(::java::awt::event::InputMethodEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_InputMethodListener__
diff --git a/libjava/java/awt/event/InvocationEvent.h b/libjava/java/awt/event/InvocationEvent.h
deleted file mode 100644
index 2dde3a4213e..00000000000
--- a/libjava/java/awt/event/InvocationEvent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_InvocationEvent__
-#define __java_awt_event_InvocationEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class InvocationEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::InvocationEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  InvocationEvent(::java::lang::Object *, ::java::lang::Runnable *);
-  InvocationEvent(::java::lang::Object *, ::java::lang::Runnable *, ::java::lang::Object *, jboolean);
-public: // actually protected
-  InvocationEvent(::java::lang::Object *, jint, ::java::lang::Runnable *, ::java::lang::Object *, jboolean);
-public:
-  virtual void dispatch();
-  virtual ::java::lang::Exception * getException();
-  virtual ::java::lang::Throwable * getThrowable();
-  virtual jlong getWhen();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 436056344909459450LL;
-public:
-  static const jint INVOCATION_FIRST = 1200;
-  static const jint INVOCATION_DEFAULT = 1200;
-  static const jint INVOCATION_LAST = 1200;
-public: // actually protected
-  ::java::lang::Runnable * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) runnable;
-  ::java::lang::Object * notifier;
-  jboolean catchExceptions;
-private:
-  ::java::lang::Exception * exception;
-  ::java::lang::Throwable * throwable;
-  jlong when;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_InvocationEvent__
diff --git a/libjava/java/awt/event/ItemEvent.h b/libjava/java/awt/event/ItemEvent.h
deleted file mode 100644
index 61f4836468d..00000000000
--- a/libjava/java/awt/event/ItemEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ItemEvent__
-#define __java_awt_event_ItemEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ItemSelectable;
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ItemEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  ItemEvent(::java::awt::ItemSelectable *, jint, ::java::lang::Object *, jint);
-  virtual ::java::awt::ItemSelectable * getItemSelectable();
-  virtual ::java::lang::Object * getItem();
-  virtual jint getStateChange();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -608708132447206933LL;
-public:
-  static const jint ITEM_FIRST = 701;
-  static const jint ITEM_LAST = 701;
-  static const jint ITEM_STATE_CHANGED = 701;
-  static const jint SELECTED = 1;
-  static const jint DESELECTED = 2;
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) item;
-  jint stateChange;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ItemEvent__
diff --git a/libjava/java/awt/event/ItemListener.h b/libjava/java/awt/event/ItemListener.h
deleted file mode 100644
index eee09ce9dae..00000000000
--- a/libjava/java/awt/event/ItemListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ItemListener__
-#define __java_awt_event_ItemListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::ItemListener : public ::java::lang::Object
-{
-
-public:
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_ItemListener__
diff --git a/libjava/java/awt/event/KeyAdapter.h b/libjava/java/awt/event/KeyAdapter.h
deleted file mode 100644
index b63023e6610..00000000000
--- a/libjava/java/awt/event/KeyAdapter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_KeyAdapter__
-#define __java_awt_event_KeyAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyAdapter;
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::KeyAdapter : public ::java::lang::Object
-{
-
-public:
-  KeyAdapter();
-  virtual void keyTyped(::java::awt::event::KeyEvent *);
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_KeyAdapter__
diff --git a/libjava/java/awt/event/KeyEvent.h b/libjava/java/awt/event/KeyEvent.h
deleted file mode 100644
index 6b3258677c5..00000000000
--- a/libjava/java/awt/event/KeyEvent.h
+++ /dev/null
@@ -1,255 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_KeyEvent__
-#define __java_awt_event_KeyEvent__
-
-#pragma interface
-
-#include <java/awt/event/InputEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::KeyEvent : public ::java::awt::event::InputEvent
-{
-
-public:
-  KeyEvent(::java::awt::Component *, jint, jlong, jint, jint, jchar, jint);
-  KeyEvent(::java::awt::Component *, jint, jlong, jint, jint, jchar);
-  KeyEvent(::java::awt::Component *, jint, jlong, jint, jint);
-  virtual jint getKeyCode();
-  virtual void setKeyCode(jint);
-  virtual jchar getKeyChar();
-  virtual void setKeyChar(jchar);
-  virtual void setModifiers(jint);
-  virtual jint getKeyLocation();
-  static ::java::lang::String * getKeyText(jint);
-  static ::java::lang::String * getKeyModifiersText(jint);
-  virtual jboolean isActionKey();
-  virtual ::java::lang::String * paramString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -2352130953028126954LL;
-public:
-  static const jint KEY_FIRST = 400;
-  static const jint KEY_LAST = 402;
-  static const jint KEY_TYPED = 400;
-  static const jint KEY_PRESSED = 401;
-  static const jint KEY_RELEASED = 402;
-  static const jint VK_ENTER = 10;
-  static const jint VK_BACK_SPACE = 8;
-  static const jint VK_TAB = 9;
-  static const jint VK_CANCEL = 3;
-  static const jint VK_CLEAR = 12;
-  static const jint VK_SHIFT = 16;
-  static const jint VK_CONTROL = 17;
-  static const jint VK_ALT = 18;
-  static const jint VK_PAUSE = 19;
-  static const jint VK_CAPS_LOCK = 20;
-  static const jint VK_ESCAPE = 27;
-  static const jint VK_SPACE = 32;
-  static const jint VK_PAGE_UP = 33;
-  static const jint VK_PAGE_DOWN = 34;
-  static const jint VK_END = 35;
-  static const jint VK_HOME = 36;
-  static const jint VK_LEFT = 37;
-  static const jint VK_UP = 38;
-  static const jint VK_RIGHT = 39;
-  static const jint VK_DOWN = 40;
-  static const jint VK_COMMA = 44;
-  static const jint VK_MINUS = 45;
-  static const jint VK_PERIOD = 46;
-  static const jint VK_SLASH = 47;
-  static const jint VK_0 = 48;
-  static const jint VK_1 = 49;
-  static const jint VK_2 = 50;
-  static const jint VK_3 = 51;
-  static const jint VK_4 = 52;
-  static const jint VK_5 = 53;
-  static const jint VK_6 = 54;
-  static const jint VK_7 = 55;
-  static const jint VK_8 = 56;
-  static const jint VK_9 = 57;
-  static const jint VK_SEMICOLON = 59;
-  static const jint VK_EQUALS = 61;
-  static const jint VK_A = 65;
-  static const jint VK_B = 66;
-  static const jint VK_C = 67;
-  static const jint VK_D = 68;
-  static const jint VK_E = 69;
-  static const jint VK_F = 70;
-  static const jint VK_G = 71;
-  static const jint VK_H = 72;
-  static const jint VK_I = 73;
-  static const jint VK_J = 74;
-  static const jint VK_K = 75;
-  static const jint VK_L = 76;
-  static const jint VK_M = 77;
-  static const jint VK_N = 78;
-  static const jint VK_O = 79;
-  static const jint VK_P = 80;
-  static const jint VK_Q = 81;
-  static const jint VK_R = 82;
-  static const jint VK_S = 83;
-  static const jint VK_T = 84;
-  static const jint VK_U = 85;
-  static const jint VK_V = 86;
-  static const jint VK_W = 87;
-  static const jint VK_X = 88;
-  static const jint VK_Y = 89;
-  static const jint VK_Z = 90;
-  static const jint VK_OPEN_BRACKET = 91;
-  static const jint VK_BACK_SLASH = 92;
-  static const jint VK_CLOSE_BRACKET = 93;
-  static const jint VK_NUMPAD0 = 96;
-  static const jint VK_NUMPAD1 = 97;
-  static const jint VK_NUMPAD2 = 98;
-  static const jint VK_NUMPAD3 = 99;
-  static const jint VK_NUMPAD4 = 100;
-  static const jint VK_NUMPAD5 = 101;
-  static const jint VK_NUMPAD6 = 102;
-  static const jint VK_NUMPAD7 = 103;
-  static const jint VK_NUMPAD8 = 104;
-  static const jint VK_NUMPAD9 = 105;
-  static const jint VK_MULTIPLY = 106;
-  static const jint VK_ADD = 107;
-  static const jint VK_SEPARATER = 108;
-  static const jint VK_SEPARATOR = 108;
-  static const jint VK_SUBTRACT = 109;
-  static const jint VK_DECIMAL = 110;
-  static const jint VK_DIVIDE = 111;
-  static const jint VK_DELETE = 127;
-  static const jint VK_NUM_LOCK = 144;
-  static const jint VK_SCROLL_LOCK = 145;
-  static const jint VK_F1 = 112;
-  static const jint VK_F2 = 113;
-  static const jint VK_F3 = 114;
-  static const jint VK_F4 = 115;
-  static const jint VK_F5 = 116;
-  static const jint VK_F6 = 117;
-  static const jint VK_F7 = 118;
-  static const jint VK_F8 = 119;
-  static const jint VK_F9 = 120;
-  static const jint VK_F10 = 121;
-  static const jint VK_F11 = 122;
-  static const jint VK_F12 = 123;
-  static const jint VK_F13 = 61440;
-  static const jint VK_F14 = 61441;
-  static const jint VK_F15 = 61442;
-  static const jint VK_F16 = 61443;
-  static const jint VK_F17 = 61444;
-  static const jint VK_F18 = 61445;
-  static const jint VK_F19 = 61446;
-  static const jint VK_F20 = 61447;
-  static const jint VK_F21 = 61448;
-  static const jint VK_F22 = 61449;
-  static const jint VK_F23 = 61450;
-  static const jint VK_F24 = 61451;
-  static const jint VK_PRINTSCREEN = 154;
-  static const jint VK_INSERT = 155;
-  static const jint VK_HELP = 156;
-  static const jint VK_META = 157;
-  static const jint VK_BACK_QUOTE = 192;
-  static const jint VK_QUOTE = 222;
-  static const jint VK_KP_UP = 224;
-  static const jint VK_KP_DOWN = 225;
-  static const jint VK_KP_LEFT = 226;
-  static const jint VK_KP_RIGHT = 227;
-  static const jint VK_DEAD_GRAVE = 128;
-  static const jint VK_DEAD_ACUTE = 129;
-  static const jint VK_DEAD_CIRCUMFLEX = 130;
-  static const jint VK_DEAD_TILDE = 131;
-  static const jint VK_DEAD_MACRON = 132;
-  static const jint VK_DEAD_BREVE = 133;
-  static const jint VK_DEAD_ABOVEDOT = 134;
-  static const jint VK_DEAD_DIAERESIS = 135;
-  static const jint VK_DEAD_ABOVERING = 136;
-  static const jint VK_DEAD_DOUBLEACUTE = 137;
-  static const jint VK_DEAD_CARON = 138;
-  static const jint VK_DEAD_CEDILLA = 139;
-  static const jint VK_DEAD_OGONEK = 140;
-  static const jint VK_DEAD_IOTA = 141;
-  static const jint VK_DEAD_VOICED_SOUND = 142;
-  static const jint VK_DEAD_SEMIVOICED_SOUND = 143;
-  static const jint VK_AMPERSAND = 150;
-  static const jint VK_ASTERISK = 151;
-  static const jint VK_QUOTEDBL = 152;
-  static const jint VK_LESS = 153;
-  static const jint VK_GREATER = 160;
-  static const jint VK_BRACELEFT = 161;
-  static const jint VK_BRACERIGHT = 162;
-  static const jint VK_AT = 512;
-  static const jint VK_COLON = 513;
-  static const jint VK_CIRCUMFLEX = 514;
-  static const jint VK_DOLLAR = 515;
-  static const jint VK_EURO_SIGN = 516;
-  static const jint VK_EXCLAMATION_MARK = 517;
-  static const jint VK_INVERTED_EXCLAMATION_MARK = 518;
-  static const jint VK_LEFT_PARENTHESIS = 519;
-  static const jint VK_NUMBER_SIGN = 520;
-  static const jint VK_PLUS = 521;
-  static const jint VK_RIGHT_PARENTHESIS = 522;
-  static const jint VK_UNDERSCORE = 523;
-  static const jint VK_FINAL = 24;
-  static const jint VK_CONVERT = 28;
-  static const jint VK_NONCONVERT = 29;
-  static const jint VK_ACCEPT = 30;
-  static const jint VK_MODECHANGE = 31;
-  static const jint VK_KANA = 21;
-  static const jint VK_KANJI = 25;
-  static const jint VK_ALPHANUMERIC = 240;
-  static const jint VK_KATAKANA = 241;
-  static const jint VK_HIRAGANA = 242;
-  static const jint VK_FULL_WIDTH = 243;
-  static const jint VK_HALF_WIDTH = 244;
-  static const jint VK_ROMAN_CHARACTERS = 245;
-  static const jint VK_ALL_CANDIDATES = 256;
-  static const jint VK_PREVIOUS_CANDIDATE = 257;
-  static const jint VK_CODE_INPUT = 258;
-  static const jint VK_JAPANESE_KATAKANA = 259;
-  static const jint VK_JAPANESE_HIRAGANA = 260;
-  static const jint VK_JAPANESE_ROMAN = 261;
-  static const jint VK_KANA_LOCK = 262;
-  static const jint VK_INPUT_METHOD_ON_OFF = 263;
-  static const jint VK_CUT = 65489;
-  static const jint VK_COPY = 65485;
-  static const jint VK_PASTE = 65487;
-  static const jint VK_UNDO = 65483;
-  static const jint VK_AGAIN = 65481;
-  static const jint VK_FIND = 65488;
-  static const jint VK_PROPS = 65482;
-  static const jint VK_STOP = 65480;
-  static const jint VK_COMPOSE = 65312;
-  static const jint VK_ALT_GRAPH = 65406;
-  static const jint VK_BEGIN = 65368;
-  static const jint VK_CONTEXT_MENU = 525;
-  static const jint VK_WINDOWS = 524;
-  static const jint VK_UNDEFINED = 0;
-  static const jchar CHAR_UNDEFINED = 65535;
-  static const jint KEY_LOCATION_UNKNOWN = 0;
-  static const jint KEY_LOCATION_STANDARD = 1;
-  static const jint KEY_LOCATION_LEFT = 2;
-  static const jint KEY_LOCATION_RIGHT = 3;
-  static const jint KEY_LOCATION_NUMPAD = 4;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::event::InputEvent)))) keyCode;
-  jchar keyChar;
-  jint keyLocation;
-  jboolean isProxyActive;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_KeyEvent__
diff --git a/libjava/java/awt/event/KeyListener.h b/libjava/java/awt/event/KeyListener.h
deleted file mode 100644
index a25e5b83e8f..00000000000
--- a/libjava/java/awt/event/KeyListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_KeyListener__
-#define __java_awt_event_KeyListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-          class KeyListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::KeyListener : public ::java::lang::Object
-{
-
-public:
-  virtual void keyTyped(::java::awt::event::KeyEvent *) = 0;
-  virtual void keyPressed(::java::awt::event::KeyEvent *) = 0;
-  virtual void keyReleased(::java::awt::event::KeyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_KeyListener__
diff --git a/libjava/java/awt/event/MouseAdapter.h b/libjava/java/awt/event/MouseAdapter.h
deleted file mode 100644
index d0ee27ee757..00000000000
--- a/libjava/java/awt/event/MouseAdapter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseAdapter__
-#define __java_awt_event_MouseAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseAdapter;
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseAdapter : public ::java::lang::Object
-{
-
-public:
-  MouseAdapter();
-  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 // __java_awt_event_MouseAdapter__
diff --git a/libjava/java/awt/event/MouseEvent.h b/libjava/java/awt/event/MouseEvent.h
deleted file mode 100644
index 82ef6c22d12..00000000000
--- a/libjava/java/awt/event/MouseEvent.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseEvent__
-#define __java_awt_event_MouseEvent__
-
-#pragma interface
-
-#include <java/awt/event/InputEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseEvent : public ::java::awt::event::InputEvent
-{
-
-public:
-  MouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean, jint);
-  MouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean);
-  MouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jint, jint, jboolean, jint);
-  virtual jint getX();
-  virtual jint getY();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual jint getXOnScreen();
-  virtual jint getYOnScreen();
-  virtual ::java::awt::Point * getPoint();
-  virtual void translatePoint(jint, jint);
-  virtual jint getClickCount();
-  virtual jint getButton();
-  virtual jboolean isPopupTrigger();
-  static ::java::lang::String * getMouseModifiersText(jint);
-  virtual ::java::lang::String * paramString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -991214153494842848LL;
-public:
-  static const jint MOUSE_FIRST = 500;
-  static const jint MOUSE_LAST = 507;
-  static const jint MOUSE_CLICKED = 500;
-  static const jint MOUSE_PRESSED = 501;
-  static const jint MOUSE_RELEASED = 502;
-  static const jint MOUSE_MOVED = 503;
-  static const jint MOUSE_ENTERED = 504;
-  static const jint MOUSE_EXITED = 505;
-  static const jint NOBUTTON = 0;
-  static const jint BUTTON1 = 1;
-  static const jint BUTTON2 = 2;
-  static const jint BUTTON3 = 3;
-  static const jint MOUSE_DRAGGED = 506;
-  static const jint MOUSE_WHEEL = 507;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::event::InputEvent)))) x;
-  jint y;
-  jint absX;
-  jint absY;
-  jint clickCount;
-  jint button;
-  jboolean popupTrigger;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_MouseEvent__
diff --git a/libjava/java/awt/event/MouseListener.h b/libjava/java/awt/event/MouseListener.h
deleted file mode 100644
index d3263ab8e74..00000000000
--- a/libjava/java/awt/event/MouseListener.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseListener__
-#define __java_awt_event_MouseListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-          class MouseListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseListener : 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_MouseListener__
diff --git a/libjava/java/awt/event/MouseMotionAdapter.h b/libjava/java/awt/event/MouseMotionAdapter.h
deleted file mode 100644
index 2c29cdd9d54..00000000000
--- a/libjava/java/awt/event/MouseMotionAdapter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseMotionAdapter__
-#define __java_awt_event_MouseMotionAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-          class MouseMotionAdapter;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseMotionAdapter : public ::java::lang::Object
-{
-
-public:
-  MouseMotionAdapter();
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_MouseMotionAdapter__
diff --git a/libjava/java/awt/event/MouseMotionListener.h b/libjava/java/awt/event/MouseMotionListener.h
deleted file mode 100644
index 84087bbf0a2..00000000000
--- a/libjava/java/awt/event/MouseMotionListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseMotionListener__
-#define __java_awt_event_MouseMotionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-          class MouseMotionListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseMotionListener : public ::java::lang::Object
-{
-
-public:
-  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 // __java_awt_event_MouseMotionListener__
diff --git a/libjava/java/awt/event/MouseWheelEvent.h b/libjava/java/awt/event/MouseWheelEvent.h
deleted file mode 100644
index fd804a126c4..00000000000
--- a/libjava/java/awt/event/MouseWheelEvent.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseWheelEvent__
-#define __java_awt_event_MouseWheelEvent__
-
-#pragma interface
-
-#include <java/awt/event/MouseEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class MouseWheelEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseWheelEvent : public ::java::awt::event::MouseEvent
-{
-
-public:
-  MouseWheelEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean, jint, jint, jint);
-  virtual jint getScrollType();
-  virtual jint getScrollAmount();
-  virtual jint getWheelRotation();
-  virtual jint getUnitsToScroll();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 6459879390515399677LL;
-public:
-  static const jint WHEEL_UNIT_SCROLL = 0;
-  static const jint WHEEL_BLOCK_SCROLL = 1;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::event::MouseEvent)))) scrollType;
-  jint scrollAmount;
-  jint wheelRotation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_MouseWheelEvent__
diff --git a/libjava/java/awt/event/MouseWheelListener.h b/libjava/java/awt/event/MouseWheelListener.h
deleted file mode 100644
index 525b427e413..00000000000
--- a/libjava/java/awt/event/MouseWheelListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseWheelListener__
-#define __java_awt_event_MouseWheelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseWheelEvent;
-          class MouseWheelListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseWheelListener : public ::java::lang::Object
-{
-
-public:
-  virtual void mouseWheelMoved(::java::awt::event::MouseWheelEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_MouseWheelListener__
diff --git a/libjava/java/awt/event/PaintEvent.h b/libjava/java/awt/event/PaintEvent.h
deleted file mode 100644
index 4d1802729c2..00000000000
--- a/libjava/java/awt/event/PaintEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_PaintEvent__
-#define __java_awt_event_PaintEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Rectangle;
-      namespace event
-      {
-          class PaintEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::PaintEvent : public ::java::awt::event::ComponentEvent
-{
-
-public:
-  PaintEvent(::java::awt::Component *, jint, ::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * getUpdateRect();
-  virtual void setUpdateRect(::java::awt::Rectangle *);
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 1267492026433337593LL;
-public:
-  static const jint PAINT_FIRST = 800;
-  static const jint PAINT_LAST = 801;
-  static const jint PAINT = 800;
-  static const jint UPDATE = 801;
-private:
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) updateRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_PaintEvent__
diff --git a/libjava/java/awt/event/TextEvent.h b/libjava/java/awt/event/TextEvent.h
deleted file mode 100644
index bd673f73ccb..00000000000
--- a/libjava/java/awt/event/TextEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_TextEvent__
-#define __java_awt_event_TextEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class TextEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::TextEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  TextEvent(::java::lang::Object *, jint);
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 6269902291250941179LL;
-public:
-  static const jint TEXT_FIRST = 900;
-  static const jint TEXT_LAST = 900;
-  static const jint TEXT_VALUE_CHANGED = 900;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_TextEvent__
diff --git a/libjava/java/awt/event/TextListener.h b/libjava/java/awt/event/TextListener.h
deleted file mode 100644
index cb3ad2c9185..00000000000
--- a/libjava/java/awt/event/TextListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_TextListener__
-#define __java_awt_event_TextListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class TextEvent;
-          class TextListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::TextListener : public ::java::lang::Object
-{
-
-public:
-  virtual void textValueChanged(::java::awt::event::TextEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_TextListener__
diff --git a/libjava/java/awt/event/WindowAdapter.h b/libjava/java/awt/event/WindowAdapter.h
deleted file mode 100644
index fda064b21c5..00000000000
--- a/libjava/java/awt/event/WindowAdapter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowAdapter__
-#define __java_awt_event_WindowAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowAdapter;
-          class WindowEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowAdapter : public ::java::lang::Object
-{
-
-public:
-  WindowAdapter();
-  virtual void windowOpened(::java::awt::event::WindowEvent *);
-  virtual void windowClosing(::java::awt::event::WindowEvent *);
-  virtual void windowClosed(::java::awt::event::WindowEvent *);
-  virtual void windowIconified(::java::awt::event::WindowEvent *);
-  virtual void windowDeiconified(::java::awt::event::WindowEvent *);
-  virtual void windowActivated(::java::awt::event::WindowEvent *);
-  virtual void windowDeactivated(::java::awt::event::WindowEvent *);
-  virtual void windowStateChanged(::java::awt::event::WindowEvent *);
-  virtual void windowGainedFocus(::java::awt::event::WindowEvent *);
-  virtual void windowLostFocus(::java::awt::event::WindowEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_WindowAdapter__
diff --git a/libjava/java/awt/event/WindowEvent.h b/libjava/java/awt/event/WindowEvent.h
deleted file mode 100644
index 886927787e7..00000000000
--- a/libjava/java/awt/event/WindowEvent.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowEvent__
-#define __java_awt_event_WindowEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Window;
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowEvent : public ::java::awt::event::ComponentEvent
-{
-
-public:
-  WindowEvent(::java::awt::Window *, jint, ::java::awt::Window *, jint, jint);
-  WindowEvent(::java::awt::Window *, jint, ::java::awt::Window *);
-  WindowEvent(::java::awt::Window *, jint, jint, jint);
-  WindowEvent(::java::awt::Window *, jint);
-  virtual ::java::awt::Window * getWindow();
-  virtual ::java::awt::Window * getOppositeWindow();
-  virtual jint getOldState();
-  virtual jint getNewState();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -1567959133147912127LL;
-public:
-  static const jint WINDOW_FIRST = 200;
-  static const jint WINDOW_OPENED = 200;
-  static const jint WINDOW_CLOSING = 201;
-  static const jint WINDOW_CLOSED = 202;
-  static const jint WINDOW_ICONIFIED = 203;
-  static const jint WINDOW_DEICONIFIED = 204;
-  static const jint WINDOW_ACTIVATED = 205;
-  static const jint WINDOW_DEACTIVATED = 206;
-  static const jint WINDOW_GAINED_FOCUS = 207;
-  static const jint WINDOW_LOST_FOCUS = 208;
-  static const jint WINDOW_STATE_CHANGED = 209;
-  static const jint WINDOW_LAST = 209;
-private:
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) opposite;
-  jint oldState;
-  jint newState;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_WindowEvent__
diff --git a/libjava/java/awt/event/WindowFocusListener.h b/libjava/java/awt/event/WindowFocusListener.h
deleted file mode 100644
index 5ff8d3ac18a..00000000000
--- a/libjava/java/awt/event/WindowFocusListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowFocusListener__
-#define __java_awt_event_WindowFocusListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-          class WindowFocusListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowFocusListener : public ::java::lang::Object
-{
-
-public:
-  virtual void windowGainedFocus(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowLostFocus(::java::awt::event::WindowEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_WindowFocusListener__
diff --git a/libjava/java/awt/event/WindowListener.h b/libjava/java/awt/event/WindowListener.h
deleted file mode 100644
index b1b3109fc27..00000000000
--- a/libjava/java/awt/event/WindowListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowListener__
-#define __java_awt_event_WindowListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-          class WindowListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowListener : public ::java::lang::Object
-{
-
-public:
-  virtual void windowOpened(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowClosing(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowClosed(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowIconified(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowDeiconified(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowActivated(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowDeactivated(::java::awt::event::WindowEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_WindowListener__
diff --git a/libjava/java/awt/event/WindowStateListener.h b/libjava/java/awt/event/WindowStateListener.h
deleted file mode 100644
index 459ad6926be..00000000000
--- a/libjava/java/awt/event/WindowStateListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowStateListener__
-#define __java_awt_event_WindowStateListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-          class WindowStateListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowStateListener : public ::java::lang::Object
-{
-
-public:
-  virtual void windowStateChanged(::java::awt::event::WindowEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_WindowStateListener__
diff --git a/libjava/java/awt/font/FontRenderContext.h b/libjava/java/awt/font/FontRenderContext.h
deleted file mode 100644
index 30fb5973aee..00000000000
--- a/libjava/java/awt/font/FontRenderContext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_FontRenderContext__
-#define __java_awt_font_FontRenderContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class FontRenderContext;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class java::awt::font::FontRenderContext : public ::java::lang::Object
-{
-
-public: // actually protected
-  FontRenderContext();
-public:
-  FontRenderContext(::java::awt::geom::AffineTransform *, jboolean, jboolean);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean equals(::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual jint hashCode();
-  virtual jboolean isAntiAliased();
-  virtual jboolean usesFractionalMetrics();
-private:
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) affineTransform;
-  jboolean isAntiAliased__;
-  jboolean usesFractionalMetrics__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_FontRenderContext__
diff --git a/libjava/java/awt/font/GlyphJustificationInfo.h b/libjava/java/awt/font/GlyphJustificationInfo.h
deleted file mode 100644
index eb880668053..00000000000
--- a/libjava/java/awt/font/GlyphJustificationInfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_GlyphJustificationInfo__
-#define __java_awt_font_GlyphJustificationInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class GlyphJustificationInfo;
-      }
-    }
-  }
-}
-
-class java::awt::font::GlyphJustificationInfo : public ::java::lang::Object
-{
-
-public:
-  GlyphJustificationInfo(jfloat, jboolean, jint, jfloat, jfloat, jboolean, jint, jfloat, jfloat);
-  static const jint PRIORITY_KASHIDA = 0;
-  static const jint PRIORITY_WHITESPACE = 1;
-  static const jint PRIORITY_INTERCHAR = 2;
-  static const jint PRIORITY_NONE = 3;
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) weight;
-  jint growPriority;
-  jboolean growAbsorb;
-  jfloat growLeftLimit;
-  jfloat growRightLimit;
-  jint shrinkPriority;
-  jboolean shrinkAbsorb;
-  jfloat shrinkLeftLimit;
-  jfloat shrinkRightLimit;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_GlyphJustificationInfo__
diff --git a/libjava/java/awt/font/GlyphMetrics.h b/libjava/java/awt/font/GlyphMetrics.h
deleted file mode 100644
index 7c44a20f263..00000000000
--- a/libjava/java/awt/font/GlyphMetrics.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_GlyphMetrics__
-#define __java_awt_font_GlyphMetrics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class GlyphMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::GlyphMetrics : public ::java::lang::Object
-{
-
-public:
-  GlyphMetrics(jboolean, jfloat, jfloat, ::java::awt::geom::Rectangle2D *, jbyte);
-  GlyphMetrics(jfloat, ::java::awt::geom::Rectangle2D *, jbyte);
-  jfloat getAdvance();
-  jfloat getAdvanceX();
-  jfloat getAdvanceY();
-  ::java::awt::geom::Rectangle2D * getBounds2D();
-  jfloat getLSB();
-  jfloat getRSB();
-  jint getType();
-  jboolean isCombining();
-  jboolean isComponent();
-  jboolean isLigature();
-  jboolean isStandard();
-  jboolean isWhitespace();
-  static const jbyte COMBINING = 2;
-  static const jbyte COMPONENT = 3;
-  static const jbyte LIGATURE = 1;
-  static const jbyte STANDARD = 0;
-  static const jbyte WHITESPACE = 4;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) horizontal;
-  jfloat advanceX;
-  jfloat advanceY;
-  ::java::awt::geom::Rectangle2D * bounds;
-  jbyte glyphType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_GlyphMetrics__
diff --git a/libjava/java/awt/font/GlyphVector.h b/libjava/java/awt/font/GlyphVector.h
deleted file mode 100644
index 67826afa8ca..00000000000
--- a/libjava/java/awt/font/GlyphVector.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_GlyphVector__
-#define __java_awt_font_GlyphVector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Rectangle;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphJustificationInfo;
-          class GlyphMetrics;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::GlyphVector : public ::java::lang::Object
-{
-
-public:
-  GlyphVector();
-  virtual jboolean equals(::java::awt::font::GlyphVector *) = 0;
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext() = 0;
-  virtual jint getGlyphCharIndex(jint);
-  virtual JArray< jint > * getGlyphCharIndices(jint, jint, JArray< jint > *);
-  virtual jint getGlyphCode(jint) = 0;
-  virtual JArray< jint > * getGlyphCodes(jint, jint, JArray< jint > *) = 0;
-  virtual ::java::awt::font::GlyphJustificationInfo * getGlyphJustificationInfo(jint) = 0;
-  virtual ::java::awt::Shape * getGlyphLogicalBounds(jint) = 0;
-  virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint) = 0;
-  virtual ::java::awt::Shape * getGlyphOutline(jint) = 0;
-  virtual ::java::awt::Shape * getGlyphOutline(jint, jfloat, jfloat);
-  virtual ::java::awt::Rectangle * getGlyphPixelBounds(jint, ::java::awt::font::FontRenderContext *, jfloat, jfloat);
-  virtual ::java::awt::geom::Point2D * getGlyphPosition(jint) = 0;
-  virtual JArray< jfloat > * getGlyphPositions(jint, jint, JArray< jfloat > *) = 0;
-  virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint) = 0;
-  virtual ::java::awt::Shape * getGlyphVisualBounds(jint) = 0;
-  virtual jint getLayoutFlags();
-  virtual ::java::awt::geom::Rectangle2D * getLogicalBounds() = 0;
-  virtual jint getNumGlyphs() = 0;
-  virtual ::java::awt::Shape * getOutline() = 0;
-  virtual ::java::awt::Shape * getOutline(jfloat, jfloat) = 0;
-  virtual ::java::awt::Rectangle * getPixelBounds(::java::awt::font::FontRenderContext *, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getVisualBounds() = 0;
-  virtual void performDefaultLayout() = 0;
-  virtual void setGlyphPosition(jint, ::java::awt::geom::Point2D *) = 0;
-  virtual void setGlyphTransform(jint, ::java::awt::geom::AffineTransform *) = 0;
-  static const jint FLAG_COMPLEX_GLYPHS = 8;
-  static const jint FLAG_HAS_POSITION_ADJUSTMENTS = 2;
-  static const jint FLAG_HAS_TRANSFORMS = 1;
-  static const jint FLAG_MASK = 15;
-  static const jint FLAG_RUN_RTL = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_GlyphVector__
diff --git a/libjava/java/awt/font/GraphicAttribute.h b/libjava/java/awt/font/GraphicAttribute.h
deleted file mode 100644
index 622cbed7b89..00000000000
--- a/libjava/java/awt/font/GraphicAttribute.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_GraphicAttribute__
-#define __java_awt_font_GraphicAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics2D;
-      namespace font
-      {
-          class GlyphJustificationInfo;
-          class GraphicAttribute;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::GraphicAttribute : public ::java::lang::Object
-{
-
-public: // actually protected
-  GraphicAttribute(jint);
-public:
-  virtual void draw(::java::awt::Graphics2D *, jfloat, jfloat) = 0;
-  virtual jfloat getAdvance() = 0;
-  virtual jfloat getAscent() = 0;
-  virtual jfloat getDescent() = 0;
-  virtual jint getAlignment();
-  virtual ::java::awt::geom::Rectangle2D * getBounds();
-  virtual ::java::awt::font::GlyphJustificationInfo * getJustificationInfo();
-  static const jint BOTTOM_ALIGNMENT = -2;
-  static const jint CENTER_BASELINE = 1;
-  static const jint HANGING_BASELINE = 2;
-  static const jint ROMAN_BASELINE = 0;
-  static const jint TOP_ALIGNMENT = -1;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) alignment;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_GraphicAttribute__
diff --git a/libjava/java/awt/font/ImageGraphicAttribute.h b/libjava/java/awt/font/ImageGraphicAttribute.h
deleted file mode 100644
index 086fc3d1b53..00000000000
--- a/libjava/java/awt/font/ImageGraphicAttribute.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_ImageGraphicAttribute__
-#define __java_awt_font_ImageGraphicAttribute__
-
-#pragma interface
-
-#include <java/awt/font/GraphicAttribute.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics2D;
-        class Image;
-      namespace font
-      {
-          class ImageGraphicAttribute;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::ImageGraphicAttribute : public ::java::awt::font::GraphicAttribute
-{
-
-public:
-  ImageGraphicAttribute(::java::awt::Image *, jint);
-  ImageGraphicAttribute(::java::awt::Image *, jint, jfloat, jfloat);
-  void draw(::java::awt::Graphics2D *, jfloat, jfloat);
-  jboolean equals(::java::lang::Object *);
-  jboolean equals(::java::awt::font::ImageGraphicAttribute *);
-  jfloat getAdvance();
-  jfloat getAscent();
-  ::java::awt::geom::Rectangle2D * getBounds();
-  jfloat getDescent();
-  jint hashCode();
-private:
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::awt::font::GraphicAttribute)))) image;
-  jfloat originX;
-  jfloat originY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_ImageGraphicAttribute__
diff --git a/libjava/java/awt/font/LineBreakMeasurer.h b/libjava/java/awt/font/LineBreakMeasurer.h
deleted file mode 100644
index 3d862e74833..00000000000
--- a/libjava/java/awt/font/LineBreakMeasurer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_LineBreakMeasurer__
-#define __java_awt_font_LineBreakMeasurer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class FontRenderContext;
-          class LineBreakMeasurer;
-          class TextLayout;
-          class TextMeasurer;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class BreakIterator;
-    }
-  }
-}
-
-class java::awt::font::LineBreakMeasurer : public ::java::lang::Object
-{
-
-public:
-  LineBreakMeasurer(::java::text::AttributedCharacterIterator *, ::java::text::BreakIterator *, ::java::awt::font::FontRenderContext *);
-  LineBreakMeasurer(::java::text::AttributedCharacterIterator *, ::java::awt::font::FontRenderContext *);
-  void deleteChar(::java::text::AttributedCharacterIterator *, jint);
-  void insertChar(::java::text::AttributedCharacterIterator *, jint);
-  ::java::awt::font::TextLayout * nextLayout(jfloat);
-  ::java::awt::font::TextLayout * nextLayout(jfloat, jint, jboolean);
-  jint nextOffset(jfloat);
-  jint nextOffset(jfloat, jint, jboolean);
-  void setPosition(jint);
-  jint getPosition();
-private:
-  ::java::text::AttributedCharacterIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
-  jint position;
-  ::java::awt::font::TextMeasurer * tm;
-  jint numChars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_LineBreakMeasurer__
diff --git a/libjava/java/awt/font/LineMetrics.h b/libjava/java/awt/font/LineMetrics.h
deleted file mode 100644
index 35b8594dc1d..00000000000
--- a/libjava/java/awt/font/LineMetrics.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_LineMetrics__
-#define __java_awt_font_LineMetrics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class LineMetrics;
-      }
-    }
-  }
-}
-
-class java::awt::font::LineMetrics : public ::java::lang::Object
-{
-
-public:
-  LineMetrics();
-  virtual jfloat getAscent() = 0;
-  virtual jint getBaselineIndex() = 0;
-  virtual JArray< jfloat > * getBaselineOffsets() = 0;
-  virtual jfloat getDescent() = 0;
-  virtual jfloat getHeight() = 0;
-  virtual jfloat getLeading() = 0;
-  virtual jint getNumChars() = 0;
-  virtual jfloat getStrikethroughOffset() = 0;
-  virtual jfloat getStrikethroughThickness() = 0;
-  virtual jfloat getUnderlineOffset() = 0;
-  virtual jfloat getUnderlineThickness() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_LineMetrics__
diff --git a/libjava/java/awt/font/MultipleMaster.h b/libjava/java/awt/font/MultipleMaster.h
deleted file mode 100644
index 99e4580ae29..00000000000
--- a/libjava/java/awt/font/MultipleMaster.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_MultipleMaster__
-#define __java_awt_font_MultipleMaster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class MultipleMaster;
-      }
-    }
-  }
-}
-
-class java::awt::font::MultipleMaster : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Font * deriveMMFont(JArray< jfloat > *) = 0;
-  virtual ::java::awt::Font * deriveMMFont(JArray< jfloat > *, jfloat, jfloat, jfloat, jfloat) = 0;
-  virtual JArray< jfloat > * getDesignAxisDefaults() = 0;
-  virtual JArray< ::java::lang::String * > * getDesignAxisNames() = 0;
-  virtual JArray< jfloat > * getDesignAxisRanges() = 0;
-  virtual jint getNumDesignAxes() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_font_MultipleMaster__
diff --git a/libjava/java/awt/font/NumericShaper.h b/libjava/java/awt/font/NumericShaper.h
deleted file mode 100644
index 85f0d4c318b..00000000000
--- a/libjava/java/awt/font/NumericShaper.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_NumericShaper__
-#define __java_awt_font_NumericShaper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class NumericShaper;
-      }
-    }
-  }
-}
-
-class java::awt::font::NumericShaper : public ::java::lang::Object
-{
-
-  NumericShaper(jint, jint);
-public:
-  jint getRanges();
-  jboolean isContextual();
-  void shape(JArray< jchar > *, jint, jint);
-private:
-  jint classify(::java::lang::Character$UnicodeBlock *);
-public:
-  void shape(JArray< jchar > *, jint, jint, jint);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-  static ::java::awt::font::NumericShaper * getShaper(jint);
-  static ::java::awt::font::NumericShaper * getContextualShaper(jint);
-  static ::java::awt::font::NumericShaper * getContextualShaper(jint, jint);
-private:
-  static const jlong serialVersionUID = -8022764705923730308LL;
-public:
-  static const jint ALL_RANGES = 524287;
-  static const jint ARABIC = 2;
-  static const jint BENGALI = 16;
-  static const jint DEVANAGARI = 8;
-  static const jint EASTERN_ARABIC = 4;
-  static const jint ETHIOPIC = 65536;
-  static const jint EUROPEAN = 1;
-  static const jint GUJARATI = 64;
-  static const jint GURMUKHI = 32;
-  static const jint KANNADA = 1024;
-  static const jint KHMER = 131072;
-  static const jint LAO = 8192;
-  static const jint MALAYALAM = 2048;
-  static const jint MONGOLIAN = 262144;
-  static const jint MYANMAR = 32768;
-  static const jint ORIYA = 128;
-  static const jint TAMIL = 256;
-  static const jint TELUGU = 512;
-  static const jint THAI = 4096;
-  static const jint TIBETAN = 16384;
-private:
-  static JArray< jchar > * zeroDigits;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  jint mask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_NumericShaper__
diff --git a/libjava/java/awt/font/OpenType.h b/libjava/java/awt/font/OpenType.h
deleted file mode 100644
index bd1c0a622c1..00000000000
--- a/libjava/java/awt/font/OpenType.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_OpenType__
-#define __java_awt_font_OpenType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class OpenType;
-      }
-    }
-  }
-}
-
-class java::awt::font::OpenType : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * getFontTable(jint) = 0;
-  virtual JArray< jbyte > * getFontTable(jint, jint, jint) = 0;
-  virtual JArray< jbyte > * getFontTable(::java::lang::String *) = 0;
-  virtual JArray< jbyte > * getFontTable(::java::lang::String *, jint, jint) = 0;
-  virtual jint getFontTableSize(jint) = 0;
-  virtual jint getFontTableSize(::java::lang::String *) = 0;
-  virtual jint getVersion() = 0;
-  static const jint TAG_ACNT = 1633906292;
-  static const jint TAG_AVAR = 1635148146;
-  static const jint TAG_BASE = 1111577413;
-  static const jint TAG_BDAT = 1650745716;
-  static const jint TAG_BLOC = 1651273571;
-  static const jint TAG_BSLN = 1651731566;
-  static const jint TAG_CFF = 1128678944;
-  static const jint TAG_CMAP = 1668112752;
-  static const jint TAG_CVAR = 1668702578;
-  static const jint TAG_CVT = 1668707360;
-  static const jint TAG_DSIG = 1146308935;
-  static const jint TAG_EBDT = 1161970772;
-  static const jint TAG_EBLC = 1161972803;
-  static const jint TAG_EBSC = 1161974595;
-  static const jint TAG_FDSC = 1717859171;
-  static const jint TAG_FEAT = 1717920116;
-  static const jint TAG_FMTX = 1718449272;
-  static const jint TAG_FPGM = 1718642541;
-  static const jint TAG_FVAR = 1719034226;
-  static const jint TAG_GASP = 1734439792;
-  static const jint TAG_GDEF = 1195656518;
-  static const jint TAG_GLYF = 1735162214;
-  static const jint TAG_GPOS = 1196445523;
-  static const jint TAG_GSUB = 1196643650;
-  static const jint TAG_GVAR = 1735811442;
-  static const jint TAG_HDMX = 1751412088;
-  static const jint TAG_HEAD = 1751474532;
-  static const jint TAG_HHEA = 1751672161;
-  static const jint TAG_HMTX = 1752003704;
-  static const jint TAG_JSTF = 1246975046;
-  static const jint TAG_JUST = 1786082164;
-  static const jint TAG_KERN = 1801810542;
-  static const jint TAG_LCAR = 1818452338;
-  static const jint TAG_LOCA = 1819239265;
-  static const jint TAG_LTSH = 1280594760;
-  static const jint TAG_MAXP = 1835104368;
-  static const jint TAG_MMFX = 1296909912;
-  static const jint TAG_MMSD = 1296913220;
-  static const jint TAG_MORT = 1836020340;
-  static const jint TAG_NAME = 1851878757;
-  static const jint TAG_OPBD = 1836020340;
-  static const jint TAG_OS2 = 1330851634;
-  static const jint TAG_PCLT = 1346587732;
-  static const jint TAG_POST = 1886352244;
-  static const jint TAG_PREP = 1886545264;
-  static const jint TAG_PROP = 1886547824;
-  static const jint TAG_TRAK = 1953653099;
-  static const jint TAG_TYP1 = 1954115633;
-  static const jint TAG_VDMX = 1447316824;
-  static const jint TAG_VHEA = 1986553185;
-  static const jint TAG_VMTX = 1986884728;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_font_OpenType__
diff --git a/libjava/java/awt/font/ShapeGraphicAttribute.h b/libjava/java/awt/font/ShapeGraphicAttribute.h
deleted file mode 100644
index fd8d1be57ea..00000000000
--- a/libjava/java/awt/font/ShapeGraphicAttribute.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_ShapeGraphicAttribute__
-#define __java_awt_font_ShapeGraphicAttribute__
-
-#pragma interface
-
-#include <java/awt/font/GraphicAttribute.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics2D;
-        class Shape;
-      namespace font
-      {
-          class ShapeGraphicAttribute;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::ShapeGraphicAttribute : public ::java::awt::font::GraphicAttribute
-{
-
-public:
-  ShapeGraphicAttribute(::java::awt::Shape *, jint, jboolean);
-  void draw(::java::awt::Graphics2D *, jfloat, jfloat);
-  jboolean equals(::java::lang::Object *);
-  jboolean equals(::java::awt::font::ShapeGraphicAttribute *);
-  jfloat getAdvance();
-  jfloat getAscent();
-  jfloat getDescent();
-  ::java::awt::geom::Rectangle2D * getBounds();
-  jint hashCode();
-  static const jboolean FILL = 0;
-  static const jboolean STROKE = 1;
-private:
-  ::java::awt::Shape * __attribute__((aligned(__alignof__( ::java::awt::font::GraphicAttribute)))) shape;
-  jboolean stroke;
-  ::java::awt::geom::Rectangle2D * bounds;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_ShapeGraphicAttribute__
diff --git a/libjava/java/awt/font/TextAttribute.h b/libjava/java/awt/font/TextAttribute.h
deleted file mode 100644
index 050d7149108..00000000000
--- a/libjava/java/awt/font/TextAttribute.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextAttribute__
-#define __java_awt_font_TextAttribute__
-
-#pragma interface
-
-#include <java/text/AttributedCharacterIterator$Attribute.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class TextAttribute;
-      }
-    }
-  }
-}
-
-class java::awt::font::TextAttribute : public ::java::text::AttributedCharacterIterator$Attribute
-{
-
-public: // actually protected
-  TextAttribute(::java::lang::String *);
-  ::java::lang::Object * readResolve();
-private:
-  static const jlong serialVersionUID = 7744112784117861702LL;
-public:
-  static ::java::awt::font::TextAttribute * BACKGROUND;
-  static ::java::awt::font::TextAttribute * BIDI_EMBEDDING;
-  static ::java::awt::font::TextAttribute * CHAR_REPLACEMENT;
-  static ::java::awt::font::TextAttribute * FAMILY;
-  static ::java::awt::font::TextAttribute * FONT;
-  static ::java::awt::font::TextAttribute * FOREGROUND;
-  static ::java::awt::font::TextAttribute * INPUT_METHOD_HIGHLIGHT;
-  static ::java::awt::font::TextAttribute * INPUT_METHOD_UNDERLINE;
-  static ::java::awt::font::TextAttribute * JUSTIFICATION;
-  static ::java::lang::Float * JUSTIFICATION_FULL;
-  static ::java::lang::Float * JUSTIFICATION_NONE;
-  static ::java::awt::font::TextAttribute * NUMERIC_SHAPING;
-  static ::java::awt::font::TextAttribute * POSTURE;
-  static ::java::lang::Float * POSTURE_OBLIQUE;
-  static ::java::lang::Float * POSTURE_REGULAR;
-  static ::java::awt::font::TextAttribute * RUN_DIRECTION;
-  static ::java::lang::Boolean * RUN_DIRECTION_LTR;
-  static ::java::lang::Boolean * RUN_DIRECTION_RTL;
-  static ::java::awt::font::TextAttribute * SIZE;
-  static ::java::awt::font::TextAttribute * STRIKETHROUGH;
-  static ::java::lang::Boolean * STRIKETHROUGH_ON;
-  static ::java::awt::font::TextAttribute * SUPERSCRIPT;
-  static ::java::lang::Integer * SUPERSCRIPT_SUB;
-  static ::java::lang::Integer * SUPERSCRIPT_SUPER;
-  static ::java::awt::font::TextAttribute * SWAP_COLORS;
-  static ::java::lang::Boolean * SWAP_COLORS_ON;
-  static ::java::awt::font::TextAttribute * TRANSFORM;
-  static ::java::awt::font::TextAttribute * UNDERLINE;
-  static ::java::lang::Integer * UNDERLINE_LOW_DASHED;
-  static ::java::lang::Integer * UNDERLINE_LOW_DOTTED;
-  static ::java::lang::Integer * UNDERLINE_LOW_GRAY;
-  static ::java::lang::Integer * UNDERLINE_LOW_ONE_PIXEL;
-  static ::java::lang::Integer * UNDERLINE_LOW_TWO_PIXEL;
-  static ::java::lang::Integer * UNDERLINE_ON;
-  static ::java::awt::font::TextAttribute * WEIGHT;
-  static ::java::lang::Float * WEIGHT_BOLD;
-  static ::java::lang::Float * WEIGHT_DEMIBOLD;
-  static ::java::lang::Float * WEIGHT_DEMILIGHT;
-  static ::java::lang::Float * WEIGHT_EXTRA_LIGHT;
-  static ::java::lang::Float * WEIGHT_EXTRABOLD;
-  static ::java::lang::Float * WEIGHT_HEAVY;
-  static ::java::lang::Float * WEIGHT_LIGHT;
-  static ::java::lang::Float * WEIGHT_MEDIUM;
-  static ::java::lang::Float * WEIGHT_REGULAR;
-  static ::java::lang::Float * WEIGHT_SEMIBOLD;
-  static ::java::lang::Float * WEIGHT_ULTRABOLD;
-  static ::java::awt::font::TextAttribute * WIDTH;
-  static ::java::lang::Float * WIDTH_CONDENSED;
-  static ::java::lang::Float * WIDTH_EXTENDED;
-  static ::java::lang::Float * WIDTH_REGULAR;
-  static ::java::lang::Float * WIDTH_SEMI_CONDENSED;
-  static ::java::lang::Float * WIDTH_SEMI_EXTENDED;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextAttribute__
diff --git a/libjava/java/awt/font/TextHitInfo.h b/libjava/java/awt/font/TextHitInfo.h
deleted file mode 100644
index a38745895e5..00000000000
--- a/libjava/java/awt/font/TextHitInfo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextHitInfo__
-#define __java_awt_font_TextHitInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class TextHitInfo;
-      }
-    }
-  }
-}
-
-class java::awt::font::TextHitInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TextHitInfo(jint, jboolean);
-public:
-  jint getCharIndex();
-  jboolean isLeadingEdge();
-  jint getInsertionIndex();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jboolean equals(::java::awt::font::TextHitInfo *);
-  static ::java::awt::font::TextHitInfo * leading(jint);
-  static ::java::awt::font::TextHitInfo * trailing(jint);
-  static ::java::awt::font::TextHitInfo * beforeOffset(jint);
-  static ::java::awt::font::TextHitInfo * afterOffset(jint);
-  ::java::awt::font::TextHitInfo * getOtherHit();
-  ::java::awt::font::TextHitInfo * getOffsetHit(jint);
-  ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) charIndex;
-  jboolean leadingEdge;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextHitInfo__
diff --git a/libjava/java/awt/font/TextLayout$CaretPolicy.h b/libjava/java/awt/font/TextLayout$CaretPolicy.h
deleted file mode 100644
index adb7b0d1fe6..00000000000
--- a/libjava/java/awt/font/TextLayout$CaretPolicy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextLayout$CaretPolicy__
-#define __java_awt_font_TextLayout$CaretPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class TextHitInfo;
-          class TextLayout;
-          class TextLayout$CaretPolicy;
-      }
-    }
-  }
-}
-
-class java::awt::font::TextLayout$CaretPolicy : public ::java::lang::Object
-{
-
-public:
-  TextLayout$CaretPolicy();
-  virtual ::java::awt::font::TextHitInfo * getStrongCaret(::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextLayout *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextLayout$CaretPolicy__
diff --git a/libjava/java/awt/font/TextLayout$Run.h b/libjava/java/awt/font/TextLayout$Run.h
deleted file mode 100644
index 3760b6eef9d..00000000000
--- a/libjava/java/awt/font/TextLayout$Run.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextLayout$Run__
-#define __java_awt_font_TextLayout$Run__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class GlyphVector;
-          class TextLayout;
-          class TextLayout$Run;
-      }
-    }
-  }
-}
-
-class java::awt::font::TextLayout$Run : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TextLayout$Run(::java::awt::font::TextLayout *, ::java::awt::font::GlyphVector *, ::java::awt::Font *, jint, jint);
-  virtual jboolean isLeftToRight();
-  ::java::awt::font::GlyphVector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glyphVector;
-  ::java::awt::Font * font;
-  jint runStart;
-  jint runEnd;
-  jfloat location;
-  ::java::awt::font::TextLayout * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextLayout$Run__
diff --git a/libjava/java/awt/font/TextLayout.h b/libjava/java/awt/font/TextLayout.h
deleted file mode 100644
index f5c02bafd9b..00000000000
--- a/libjava/java/awt/font/TextLayout.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextLayout__
-#define __java_awt_font_TextLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class LineMetrics;
-          class TextHitInfo;
-          class TextLayout;
-          class TextLayout$CaretPolicy;
-          class TextLayout$Run;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class Bidi;
-    }
-  }
-}
-
-class java::awt::font::TextLayout : public ::java::lang::Object
-{
-
-public:
-  TextLayout(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  TextLayout(::java::lang::String *, ::java::util::Map *, ::java::awt::font::FontRenderContext *);
-  TextLayout(::java::text::AttributedCharacterIterator *, ::java::awt::font::FontRenderContext *);
-public: // actually package-private
-  TextLayout(::java::awt::font::TextLayout *, jint, jint);
-private:
-  void setCharIndices();
-  void setupMappings();
-  static ::java::lang::String * getText(::java::text::AttributedCharacterIterator *);
-  static ::java::awt::Font * getFont(::java::text::AttributedCharacterIterator *);
-  void getStringProperties();
-  void determineWhiteSpace();
-public: // actually protected
-  ::java::lang::Object * clone();
-public:
-  void draw(::java::awt::Graphics2D *, jfloat, jfloat);
-  jboolean equals(::java::lang::Object *);
-  jboolean equals(::java::awt::font::TextLayout *);
-  jfloat getAdvance();
-  jfloat getAscent();
-  jbyte getBaseline();
-  JArray< jfloat > * getBaselineOffsets();
-  ::java::awt::Shape * getBlackBoxBounds(jint, jint);
-  ::java::awt::geom::Rectangle2D * getBounds();
-  JArray< jfloat > * getCaretInfo(::java::awt::font::TextHitInfo *);
-  JArray< jfloat > * getCaretInfo(::java::awt::font::TextHitInfo *, ::java::awt::geom::Rectangle2D *);
-  ::java::awt::Shape * getCaretShape(::java::awt::font::TextHitInfo *);
-  ::java::awt::Shape * getCaretShape(::java::awt::font::TextHitInfo *, ::java::awt::geom::Rectangle2D *);
-  JArray< ::java::awt::Shape * > * getCaretShapes(jint);
-  JArray< ::java::awt::Shape * > * getCaretShapes(jint, ::java::awt::geom::Rectangle2D *);
-  JArray< ::java::awt::Shape * > * getCaretShapes(jint, ::java::awt::geom::Rectangle2D *, ::java::awt::font::TextLayout$CaretPolicy *);
-  jint getCharacterCount();
-  jbyte getCharacterLevel(jint);
-  jfloat getDescent();
-  ::java::awt::font::TextLayout * getJustifiedLayout(jfloat);
-  jfloat getLeading();
-  ::java::awt::Shape * getLogicalHighlightShape(jint, jint);
-  ::java::awt::Shape * getLogicalHighlightShape(jint, jint, ::java::awt::geom::Rectangle2D *);
-  JArray< jint > * getLogicalRangesForVisualSelection(::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  ::java::awt::font::TextHitInfo * getNextLeftHit(jint);
-  ::java::awt::font::TextHitInfo * getNextLeftHit(jint, ::java::awt::font::TextLayout$CaretPolicy *);
-  ::java::awt::font::TextHitInfo * getNextLeftHit(::java::awt::font::TextHitInfo *);
-  ::java::awt::font::TextHitInfo * getNextRightHit(jint);
-  ::java::awt::font::TextHitInfo * getNextRightHit(jint, ::java::awt::font::TextLayout$CaretPolicy *);
-  ::java::awt::font::TextHitInfo * getNextRightHit(::java::awt::font::TextHitInfo *);
-  ::java::awt::Shape * getOutline(::java::awt::geom::AffineTransform *);
-  jfloat getVisibleAdvance();
-  ::java::awt::Shape * getVisualHighlightShape(::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  ::java::awt::Shape * getVisualHighlightShape(::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *, ::java::awt::geom::Rectangle2D *);
-private:
-  ::java::awt::Shape * left(::java::awt::geom::Rectangle2D *);
-  ::java::awt::Shape * right(::java::awt::geom::Rectangle2D *);
-public:
-  ::java::awt::font::TextHitInfo * getVisualOtherHit(::java::awt::font::TextHitInfo *);
-public: // actually protected
-  void handleJustify(jfloat);
-public:
-  ::java::awt::font::TextHitInfo * hitTestChar(jfloat, jfloat);
-  ::java::awt::font::TextHitInfo * hitTestChar(jfloat, jfloat, ::java::awt::geom::Rectangle2D *);
-  jboolean isLeftToRight();
-  jboolean isVertical();
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::awt::geom::Rectangle2D * getNaturalBounds();
-  void checkHitInfo(::java::awt::font::TextHitInfo *);
-  jint hitToCaret(::java::awt::font::TextHitInfo *);
-  ::java::awt::font::TextHitInfo * caretToHit(jint);
-  jboolean isCharacterLTR(jint);
-  ::java::awt::font::TextLayout$Run * findRunAtIndex(jint);
-  void layoutRuns();
-  JArray< ::java::awt::font::TextLayout$Run * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) runs;
-  ::java::awt::font::FontRenderContext * frc;
-  JArray< jchar > * string;
-  jint offset;
-  jint length;
-  ::java::awt::geom::Rectangle2D * boundsCache;
-  ::java::awt::font::LineMetrics * lm;
-  jfloat totalAdvance;
-  ::java::awt::geom::Rectangle2D * naturalBounds;
-  JArray< JArray< jint > * > * charIndices;
-  jboolean leftToRight;
-  jboolean hasWhitespace;
-  ::java::text::Bidi * bidi;
-  JArray< jint > * logicalToVisual;
-  JArray< jint > * visualToLogical;
-  jint hash;
-public:
-  static ::java::awt::font::TextLayout$CaretPolicy * DEFAULT_CARET_POLICY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextLayout__
diff --git a/libjava/java/awt/font/TextMeasurer.h b/libjava/java/awt/font/TextMeasurer.h
deleted file mode 100644
index 31ca7b27fa5..00000000000
--- a/libjava/java/awt/font/TextMeasurer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextMeasurer__
-#define __java_awt_font_TextMeasurer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class FontRenderContext;
-          class TextLayout;
-          class TextMeasurer;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class java::awt::font::TextMeasurer : public ::java::lang::Object
-{
-
-public:
-  TextMeasurer(::java::text::AttributedCharacterIterator *, ::java::awt::font::FontRenderContext *);
-public: // actually protected
-  ::java::lang::Object * clone();
-public:
-  void deleteChar(::java::text::AttributedCharacterIterator *, jint);
-  void insertChar(::java::text::AttributedCharacterIterator *, jint);
-  jfloat getAdvanceBetween(jint, jint);
-  ::java::awt::font::TextLayout * getLayout(jint, jint);
-  jint getLineBreakIndex(jint, jfloat);
-private:
-  ::java::text::AttributedCharacterIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
-  ::java::awt::font::FontRenderContext * frc;
-  ::java::awt::font::TextLayout * totalLayout;
-  jint numChars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextMeasurer__
diff --git a/libjava/java/awt/font/TransformAttribute.h b/libjava/java/awt/font/TransformAttribute.h
deleted file mode 100644
index 16875a23d46..00000000000
--- a/libjava/java/awt/font/TransformAttribute.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TransformAttribute__
-#define __java_awt_font_TransformAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class TransformAttribute;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class java::awt::font::TransformAttribute : public ::java::lang::Object
-{
-
-public:
-  TransformAttribute(::java::awt::geom::AffineTransform *);
-  ::java::awt::geom::AffineTransform * getTransform();
-  jboolean isIdentity();
-private:
-  static const jlong serialVersionUID = 3356247357827709530LL;
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) affineTransform;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TransformAttribute__
diff --git a/libjava/java/awt/geom/AffineTransform.h b/libjava/java/awt/geom/AffineTransform.h
deleted file mode 100644
index 4c5efc8bb24..00000000000
--- a/libjava/java/awt/geom/AffineTransform.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_AffineTransform__
-#define __java_awt_geom_AffineTransform__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::AffineTransform : public ::java::lang::Object
-{
-
-public:
-  AffineTransform();
-  AffineTransform(::java::awt::geom::AffineTransform *);
-  AffineTransform(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  AffineTransform(JArray< jfloat > *);
-  AffineTransform(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  AffineTransform(JArray< jdouble > *);
-  static ::java::awt::geom::AffineTransform * getTranslateInstance(jdouble, jdouble);
-  static ::java::awt::geom::AffineTransform * getRotateInstance(jdouble);
-  static ::java::awt::geom::AffineTransform * getRotateInstance(jdouble, jdouble, jdouble);
-  static ::java::awt::geom::AffineTransform * getScaleInstance(jdouble, jdouble);
-  static ::java::awt::geom::AffineTransform * getShearInstance(jdouble, jdouble);
-  virtual jint getType();
-  virtual jdouble getDeterminant();
-  virtual void getMatrix(JArray< jdouble > *);
-  virtual jdouble getScaleX();
-  virtual jdouble getScaleY();
-  virtual jdouble getShearX();
-  virtual jdouble getShearY();
-  virtual jdouble getTranslateX();
-  virtual jdouble getTranslateY();
-  virtual void translate(jdouble, jdouble);
-  virtual void rotate(jdouble);
-  virtual void rotate(jdouble, jdouble, jdouble);
-  virtual void scale(jdouble, jdouble);
-  virtual void shear(jdouble, jdouble);
-  virtual void setToIdentity();
-  virtual void setToTranslation(jdouble, jdouble);
-  virtual void setToRotation(jdouble);
-  virtual void setToRotation(jdouble, jdouble, jdouble);
-  virtual void setToScale(jdouble, jdouble);
-  virtual void setToShear(jdouble, jdouble);
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void setTransform(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void concatenate(::java::awt::geom::AffineTransform *);
-  virtual void preConcatenate(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::AffineTransform * createInverse();
-  virtual ::java::awt::geom::Point2D * transform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void transform(JArray< ::java::awt::geom::Point2D * > *, jint, JArray< ::java::awt::geom::Point2D * > *, jint, jint);
-  virtual void transform(JArray< jfloat > *, jint, JArray< jfloat > *, jint, jint);
-  virtual void transform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
-  virtual void transform(JArray< jfloat > *, jint, JArray< jdouble > *, jint, jint);
-  virtual void transform(JArray< jdouble > *, jint, JArray< jfloat > *, jint, jint);
-  virtual ::java::awt::geom::Point2D * inverseTransform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void inverseTransform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
-  virtual ::java::awt::geom::Point2D * deltaTransform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void deltaTransform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
-  virtual ::java::awt::Shape * createTransformedShape(::java::awt::Shape *);
-  virtual ::java::lang::String * toString();
-  virtual jboolean isIdentity();
-  virtual ::java::lang::Object * clone();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  void updateType();
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 1330973210523860834LL;
-public:
-  static const jint TYPE_IDENTITY = 0;
-  static const jint TYPE_TRANSLATION = 1;
-  static const jint TYPE_UNIFORM_SCALE = 2;
-  static const jint TYPE_GENERAL_SCALE = 4;
-  static const jint TYPE_MASK_SCALE = 6;
-  static const jint TYPE_FLIP = 64;
-  static const jint TYPE_QUADRANT_ROTATION = 8;
-  static const jint TYPE_GENERAL_ROTATION = 16;
-  static const jint TYPE_MASK_ROTATION = 24;
-  static const jint TYPE_GENERAL_TRANSFORM = 32;
-private:
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) m00;
-  jdouble m10;
-  jdouble m01;
-  jdouble m11;
-  jdouble m02;
-  jdouble m12;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_AffineTransform__
diff --git a/libjava/java/awt/geom/Arc2D$ArcIterator.h b/libjava/java/awt/geom/Arc2D$ArcIterator.h
deleted file mode 100644
index 4fdf0e15c39..00000000000
--- a/libjava/java/awt/geom/Arc2D$ArcIterator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Arc2D$ArcIterator__
-#define __java_awt_geom_Arc2D$ArcIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Arc2D;
-          class Arc2D$ArcIterator;
-          class Ellipse2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Arc2D$ArcIterator : public ::java::lang::Object
-{
-
-public:
-  Arc2D$ArcIterator(::java::awt::geom::Arc2D *, ::java::awt::geom::AffineTransform *);
-  Arc2D$ArcIterator(::java::awt::geom::Ellipse2D *, ::java::awt::geom::AffineTransform *);
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-  jint limit;
-  ::java::awt::geom::AffineTransform * xform;
-  jdouble x;
-  jdouble y;
-  jdouble w;
-  jdouble h;
-  jdouble start;
-  jdouble extent;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Arc2D$ArcIterator__
diff --git a/libjava/java/awt/geom/Arc2D$Double.h b/libjava/java/awt/geom/Arc2D$Double.h
deleted file mode 100644
index d39148b70dd..00000000000
--- a/libjava/java/awt/geom/Arc2D$Double.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Arc2D$Double__
-#define __java_awt_geom_Arc2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Arc2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Arc2D$Double;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Arc2D$Double : public ::java::awt::geom::Arc2D
-{
-
-public:
-  Arc2D$Double();
-  Arc2D$Double(jint);
-  Arc2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
-  Arc2D$Double(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jint);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jdouble getAngleStart();
-  virtual jdouble getAngleExtent();
-  virtual jboolean isEmpty();
-  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
-  virtual void setAngleStart(jdouble);
-  virtual void setAngleExtent(jdouble);
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble);
-public:
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Arc2D)))) x;
-  jdouble y;
-  jdouble width;
-  jdouble height;
-  jdouble start;
-  jdouble extent;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Arc2D$Double__
diff --git a/libjava/java/awt/geom/Arc2D$Float.h b/libjava/java/awt/geom/Arc2D$Float.h
deleted file mode 100644
index 925c425acc8..00000000000
--- a/libjava/java/awt/geom/Arc2D$Float.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Arc2D$Float__
-#define __java_awt_geom_Arc2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Arc2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Arc2D$Float;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Arc2D$Float : public ::java::awt::geom::Arc2D
-{
-
-public:
-  Arc2D$Float();
-  Arc2D$Float(jint);
-  Arc2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jint);
-  Arc2D$Float(::java::awt::geom::Rectangle2D *, jfloat, jfloat, jint);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jdouble getAngleStart();
-  virtual jdouble getAngleExtent();
-  virtual jboolean isEmpty();
-  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
-  virtual void setAngleStart(jdouble);
-  virtual void setAngleExtent(jdouble);
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble);
-public:
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Arc2D)))) x;
-  jfloat y;
-  jfloat width;
-  jfloat height;
-  jfloat start;
-  jfloat extent;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Arc2D$Float__
diff --git a/libjava/java/awt/geom/Arc2D.h b/libjava/java/awt/geom/Arc2D.h
deleted file mode 100644
index d2bfc752793..00000000000
--- a/libjava/java/awt/geom/Arc2D.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Arc2D__
-#define __java_awt_geom_Arc2D__
-
-#pragma interface
-
-#include <java/awt/geom/RectangularShape.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Arc2D;
-          class Dimension2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Arc2D : public ::java::awt::geom::RectangularShape
-{
-
-public: // actually protected
-  Arc2D(jint);
-public:
-  virtual jdouble getAngleStart() = 0;
-  virtual jdouble getAngleExtent() = 0;
-  virtual jint getArcType();
-  virtual ::java::awt::geom::Point2D * getStartPoint();
-  virtual ::java::awt::geom::Point2D * getEndPoint();
-  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint) = 0;
-  virtual void setArc(::java::awt::geom::Point2D *, ::java::awt::geom::Dimension2D *, jdouble, jdouble, jint);
-  virtual void setArc(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jint);
-  virtual void setArc(::java::awt::geom::Arc2D *);
-  virtual void setArcByCenter(jdouble, jdouble, jdouble, jdouble, jdouble, jint);
-  virtual void setArcByTangent(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, jdouble);
-  virtual void setAngleStart(jdouble) = 0;
-  virtual void setAngleExtent(jdouble) = 0;
-  virtual void setAngleStart(::java::awt::geom::Point2D *);
-  virtual void setAngles(jdouble, jdouble, jdouble, jdouble);
-  virtual void setAngles(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setArcType(jint);
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble) = 0;
-public:
-  virtual jboolean containsAngle(jdouble);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  static const jint OPEN = 0;
-  static const jint CHORD = 1;
-  static const jint PIE = 2;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::geom::RectangularShape)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Arc2D__
diff --git a/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h b/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h
deleted file mode 100644
index 2dfcf311e28..00000000000
--- a/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$AreaIterator$IteratorSegment__
-#define __java_awt_geom_Area$AreaIterator$IteratorSegment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Area$AreaIterator;
-          class Area$AreaIterator$IteratorSegment;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$AreaIterator$IteratorSegment : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Area$AreaIterator$IteratorSegment(::java::awt::geom::Area$AreaIterator *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  JArray< jdouble > * coords;
-  ::java::awt::geom::Area$AreaIterator * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$AreaIterator$IteratorSegment__
diff --git a/libjava/java/awt/geom/Area$AreaIterator.h b/libjava/java/awt/geom/Area$AreaIterator.h
deleted file mode 100644
index 86824256ad0..00000000000
--- a/libjava/java/awt/geom/Area$AreaIterator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$AreaIterator__
-#define __java_awt_geom_Area$AreaIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$AreaIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$AreaIterator : public ::java::lang::Object
-{
-
-public:
-  Area$AreaIterator(::java::awt::geom::Area *, ::java::awt::geom::AffineTransform *);
-  virtual jint currentSegment(JArray< jdouble > *);
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) segments;
-  jint index;
-  ::java::awt::geom::AffineTransform * at;
-public: // actually package-private
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$AreaIterator__
diff --git a/libjava/java/awt/geom/Area$CubicSegment.h b/libjava/java/awt/geom/Area$CubicSegment.h
deleted file mode 100644
index f5a31385e85..00000000000
--- a/libjava/java/awt/geom/Area$CubicSegment.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$CubicSegment__
-#define __java_awt_geom_Area$CubicSegment__
-
-#pragma interface
-
-#include <java/awt/geom/Area$Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$CubicSegment;
-          class Area$Segment;
-          class CubicCurve2D;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$CubicSegment : public ::java::awt::geom::Area$Segment
-{
-
-public:
-  Area$CubicSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual jdouble curveArea();
-  virtual jboolean equals(::java::awt::geom::Area$Segment *);
-  virtual ::java::awt::geom::Point2D * evaluatePoint(jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds();
-  virtual ::java::awt::geom::CubicCurve2D * getCubicCurve2D();
-  virtual JArray< jdouble > * getLoop();
-  virtual ::java::awt::geom::Point2D * getMidPoint();
-  virtual jint getType();
-  virtual jint pathIteratorFormat(JArray< jdouble > *);
-  virtual jint rayCrossing(jdouble, jdouble);
-  virtual void reverseCoords();
-  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
-  virtual void subdivideInsert(jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) cp1;
-  ::java::awt::geom::Point2D * cp2;
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$CubicSegment__
diff --git a/libjava/java/awt/geom/Area$Intersection.h b/libjava/java/awt/geom/Area$Intersection.h
deleted file mode 100644
index c4c716286c9..00000000000
--- a/libjava/java/awt/geom/Area$Intersection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$Intersection__
-#define __java_awt_geom_Area$Intersection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Area;
-          class Area$Intersection;
-          class Area$Segment;
-          class Point2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$Intersection : public ::java::lang::Object
-{
-
-public:
-  Area$Intersection(::java::awt::geom::Area *, ::java::awt::geom::Point2D *, jdouble, jdouble);
-public: // actually package-private
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  jdouble ta;
-  jdouble tb;
-  ::java::awt::geom::Area$Segment * seg;
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$Intersection__
diff --git a/libjava/java/awt/geom/Area$LineSegment.h b/libjava/java/awt/geom/Area$LineSegment.h
deleted file mode 100644
index 2eb0692a8d5..00000000000
--- a/libjava/java/awt/geom/Area$LineSegment.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$LineSegment__
-#define __java_awt_geom_Area$LineSegment__
-
-#pragma interface
-
-#include <java/awt/geom/Area$Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$LineSegment;
-          class Area$Segment;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$LineSegment : public ::java::awt::geom::Area$Segment
-{
-
-public:
-  Area$LineSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble);
-  Area$LineSegment(::java::awt::geom::Area *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void reverseCoords();
-  virtual ::java::awt::geom::Point2D * getMidPoint();
-  virtual jdouble curveArea();
-  virtual jint getType();
-  virtual void subdivideInsert(jdouble);
-  virtual jboolean isCoLinear(::java::awt::geom::Area$LineSegment *);
-  virtual ::java::awt::geom::Area$Segment * lastCoLinear();
-  virtual jboolean equals(::java::awt::geom::Area$Segment *);
-  virtual jint pathIteratorFormat(JArray< jdouble > *);
-  virtual jboolean hasIntersections(::java::awt::geom::Area$Segment *);
-  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds();
-  virtual jint rayCrossing(jdouble, jdouble);
-  ::java::awt::geom::Area * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$LineSegment__
diff --git a/libjava/java/awt/geom/Area$QuadSegment.h b/libjava/java/awt/geom/Area$QuadSegment.h
deleted file mode 100644
index ca6dc99c5c2..00000000000
--- a/libjava/java/awt/geom/Area$QuadSegment.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$QuadSegment__
-#define __java_awt_geom_Area$QuadSegment__
-
-#pragma interface
-
-#include <java/awt/geom/Area$Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$CubicSegment;
-          class Area$QuadSegment;
-          class Area$Segment;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$QuadSegment : public ::java::awt::geom::Area$Segment
-{
-
-public: // actually package-private
-  Area$QuadSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual jdouble curveArea();
-  virtual jboolean equals(::java::awt::geom::Area$Segment *);
-  virtual ::java::awt::geom::Point2D * evaluatePoint(jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds();
-  virtual ::java::awt::geom::Area$CubicSegment * getCubicSegment();
-  virtual ::java::awt::geom::Point2D * getMidPoint();
-  virtual jint getType();
-  virtual jint pathIteratorFormat(JArray< jdouble > *);
-  virtual jint rayCrossing(jdouble, jdouble);
-  virtual void reverseCoords();
-  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
-  virtual void subdivideInsert(jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) cp;
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$QuadSegment__
diff --git a/libjava/java/awt/geom/Area$Segment.h b/libjava/java/awt/geom/Area$Segment.h
deleted file mode 100644
index 866ecefdd4d..00000000000
--- a/libjava/java/awt/geom/Area$Segment.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$Segment__
-#define __java_awt_geom_Area$Segment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$Intersection;
-          class Area$Segment;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$Segment : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Area$Segment(::java::awt::geom::Area *);
-  virtual void reverseCoords() = 0;
-  virtual ::java::awt::geom::Point2D * getMidPoint() = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds() = 0;
-  virtual void transform(::java::awt::geom::AffineTransform *) = 0;
-  virtual jint getType() = 0;
-  virtual jint splitIntersections(::java::awt::geom::Area$Segment *) = 0;
-  virtual jint pathIteratorFormat(JArray< jdouble > *) = 0;
-  virtual jint rayCrossing(jdouble, jdouble) = 0;
-  virtual void subdivideInsert(jdouble) = 0;
-  virtual jdouble curveArea() = 0;
-  virtual jboolean equals(::java::awt::geom::Area$Segment *) = 0;
-  virtual jboolean contains(jdouble, jdouble);
-  virtual void nullNodes();
-  virtual void transformSegmentList(::java::awt::geom::AffineTransform *);
-  virtual jboolean hasClockwiseOrientation();
-public:
-  virtual ::java::awt::geom::Rectangle2D * getPathBounds();
-public: // actually package-private
-  virtual jdouble getSignedArea();
-  virtual void reverseAll();
-  virtual void insert(::java::awt::geom::Area$Segment *);
-  virtual jboolean isPolygonal();
-  virtual ::java::awt::geom::Area$Segment * cloneSegmentList();
-  virtual jint createNode(::java::awt::geom::Area$Segment *, ::java::awt::geom::Area$Intersection *);
-public: // actually protected
-  virtual jint createNodes(::java::awt::geom::Area$Segment *, JArray< ::java::awt::geom::Area$Intersection * > *);
-public: // actually package-private
-  virtual jboolean pathEquals(::java::awt::geom::Area$Segment *);
-  virtual ::java::awt::geom::Area$Segment * getTopLeft();
-  virtual jboolean isSegmentOutside(::java::awt::Shape *);
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) P1;
-  ::java::awt::geom::Point2D * P2;
-  ::java::awt::geom::Area$Segment * next;
-  ::java::awt::geom::Area$Segment * node;
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$Segment__
diff --git a/libjava/java/awt/geom/Area.h b/libjava/java/awt/geom/Area.h
deleted file mode 100644
index 6a127dced45..00000000000
--- a/libjava/java/awt/geom/Area.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area__
-#define __java_awt_geom_Area__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$CubicSegment;
-          class Area$Intersection;
-          class Area$LineSegment;
-          class Area$QuadSegment;
-          class Area$Segment;
-          class CubicCurve2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area : public ::java::lang::Object
-{
-
-public:
-  Area();
-  Area(::java::awt::Shape *);
-  virtual void add(::java::awt::geom::Area *);
-  virtual void subtract(::java::awt::geom::Area *);
-  virtual void intersect(::java::awt::geom::Area *);
-  virtual void exclusiveOr(::java::awt::geom::Area *);
-  virtual void reset();
-  virtual jboolean isEmpty();
-  virtual jboolean isPolygonal();
-  virtual jboolean isRectangular();
-  virtual jboolean isSingular();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::awt::geom::Area *);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::Area * createTransformedArea(::java::awt::geom::AffineTransform *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-private:
-  ::java::util::Vector * weilerAtherton(::java::util::Vector *);
-  jint getRecursionDepth(::java::awt::geom::Area$CubicSegment *);
-  void recursiveSubdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *, jint, jint, jdouble, jdouble, jdouble, jdouble);
-public: // actually package-private
-  virtual JArray< ::java::awt::geom::Area$Intersection * > * cubicCubicIntersect(::java::awt::geom::Area$CubicSegment *, ::java::awt::geom::Area$CubicSegment *);
-  virtual JArray< ::java::awt::geom::Area$Intersection * > * lineQuadIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$QuadSegment *);
-  virtual JArray< ::java::awt::geom::Area$Intersection * > * lineCubicIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$CubicSegment *);
-  virtual ::java::awt::geom::Area$Intersection * linesIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$LineSegment *);
-  virtual jboolean pointEquals(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-private:
-  ::java::util::Vector * makeSegment(::java::awt::Shape *);
-  jint createNodes(::java::awt::geom::Area$Segment *, ::java::awt::geom::Area$Segment *);
-  jint createNodesSelf(::java::awt::geom::Area$Segment *);
-  void deleteRedundantPaths(::java::util::Vector *);
-  void setDirection(::java::util::Vector *, jboolean);
-  static jdouble EPSILON;
-  static jdouble RS_EPSILON;
-  static jdouble PE_EPSILON;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) solids;
-  ::java::util::Vector * holes;
-private:
-  ::java::util::Vector * ccIntersections;
-  jint windingRule;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area__
diff --git a/libjava/java/awt/geom/CubicCurve2D$1.h b/libjava/java/awt/geom/CubicCurve2D$1.h
deleted file mode 100644
index 960807e7d7f..00000000000
--- a/libjava/java/awt/geom/CubicCurve2D$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_CubicCurve2D$1__
-#define __java_awt_geom_CubicCurve2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class CubicCurve2D;
-          class CubicCurve2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::CubicCurve2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CubicCurve2D$1(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-public: // actually package-private
-  ::java::awt::geom::CubicCurve2D * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_CubicCurve2D$1__
diff --git a/libjava/java/awt/geom/CubicCurve2D$Double.h b/libjava/java/awt/geom/CubicCurve2D$Double.h
deleted file mode 100644
index d3d47429c1f..00000000000
--- a/libjava/java/awt/geom/CubicCurve2D$Double.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_CubicCurve2D$Double__
-#define __java_awt_geom_CubicCurve2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/CubicCurve2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class CubicCurve2D$Double;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::CubicCurve2D$Double : public ::java::awt::geom::CubicCurve2D
-{
-
-public:
-  CubicCurve2D$Double();
-  CubicCurve2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getCtrlX1();
-  virtual jdouble getCtrlY1();
-  virtual ::java::awt::geom::Point2D * getCtrlP1();
-  virtual jdouble getCtrlX2();
-  virtual jdouble getCtrlY2();
-  virtual ::java::awt::geom::Point2D * getCtrlP2();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::CubicCurve2D)))) x1;
-  jdouble y1;
-  jdouble ctrlx1;
-  jdouble ctrly1;
-  jdouble ctrlx2;
-  jdouble ctrly2;
-  jdouble x2;
-  jdouble y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_CubicCurve2D$Double__
diff --git a/libjava/java/awt/geom/CubicCurve2D$Float.h b/libjava/java/awt/geom/CubicCurve2D$Float.h
deleted file mode 100644
index 6e6cd4d2c97..00000000000
--- a/libjava/java/awt/geom/CubicCurve2D$Float.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_CubicCurve2D$Float__
-#define __java_awt_geom_CubicCurve2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/CubicCurve2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class CubicCurve2D$Float;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::CubicCurve2D$Float : public ::java::awt::geom::CubicCurve2D
-{
-
-public:
-  CubicCurve2D$Float();
-  CubicCurve2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getCtrlX1();
-  virtual jdouble getCtrlY1();
-  virtual ::java::awt::geom::Point2D * getCtrlP1();
-  virtual jdouble getCtrlX2();
-  virtual jdouble getCtrlY2();
-  virtual ::java::awt::geom::Point2D * getCtrlP2();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void setCurve(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::CubicCurve2D)))) x1;
-  jfloat y1;
-  jfloat ctrlx1;
-  jfloat ctrly1;
-  jfloat ctrlx2;
-  jfloat ctrly2;
-  jfloat x2;
-  jfloat y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_CubicCurve2D$Float__
diff --git a/libjava/java/awt/geom/CubicCurve2D.h b/libjava/java/awt/geom/CubicCurve2D.h
deleted file mode 100644
index f9f82b89458..00000000000
--- a/libjava/java/awt/geom/CubicCurve2D.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_CubicCurve2D__
-#define __java_awt_geom_CubicCurve2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class CubicCurve2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::CubicCurve2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  CubicCurve2D();
-public:
-  virtual jdouble getX1() = 0;
-  virtual jdouble getY1() = 0;
-  virtual ::java::awt::geom::Point2D * getP1() = 0;
-  virtual jdouble getCtrlX1() = 0;
-  virtual jdouble getCtrlY1() = 0;
-  virtual ::java::awt::geom::Point2D * getCtrlP1() = 0;
-  virtual jdouble getCtrlX2() = 0;
-  virtual jdouble getCtrlY2() = 0;
-  virtual ::java::awt::geom::Point2D * getCtrlP2() = 0;
-  virtual jdouble getX2() = 0;
-  virtual jdouble getY2() = 0;
-  virtual ::java::awt::geom::Point2D * getP2() = 0;
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setCurve(JArray< jdouble > *, jint);
-  virtual void setCurve(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setCurve(JArray< ::java::awt::geom::Point2D * > *, jint);
-  virtual void setCurve(::java::awt::geom::CubicCurve2D *);
-  static jdouble getFlatnessSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble getFlatness(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble getFlatnessSq(JArray< jdouble > *, jint);
-  static jdouble getFlatness(JArray< jdouble > *, jint);
-  virtual jdouble getFlatnessSq();
-  virtual jdouble getFlatness();
-  virtual void subdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *);
-  static void subdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *);
-  static void subdivide(JArray< jdouble > *, jint, JArray< jdouble > *, jint, JArray< jdouble > *, jint);
-  static jint solveCubic(JArray< jdouble > *);
-  static jint solveCubic(JArray< jdouble > *, JArray< jdouble > *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual ::java::lang::Object * clone();
-private:
-  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
-public:
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-private:
-  static jdouble BIG_VALUE;
-  static jdouble EPSILON;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_CubicCurve2D__
diff --git a/libjava/java/awt/geom/Dimension2D.h b/libjava/java/awt/geom/Dimension2D.h
deleted file mode 100644
index d201d7a5f5c..00000000000
--- a/libjava/java/awt/geom/Dimension2D.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Dimension2D__
-#define __java_awt_geom_Dimension2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Dimension2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Dimension2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  Dimension2D();
-public:
-  virtual jdouble getWidth() = 0;
-  virtual jdouble getHeight() = 0;
-  virtual void setSize(jdouble, jdouble) = 0;
-  virtual void setSize(::java::awt::geom::Dimension2D *);
-  virtual ::java::lang::Object * clone();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Dimension2D__
diff --git a/libjava/java/awt/geom/Ellipse2D$Double.h b/libjava/java/awt/geom/Ellipse2D$Double.h
deleted file mode 100644
index 06b28e6f335..00000000000
--- a/libjava/java/awt/geom/Ellipse2D$Double.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Ellipse2D$Double__
-#define __java_awt_geom_Ellipse2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Ellipse2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Ellipse2D$Double;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Ellipse2D$Double : public ::java::awt::geom::Ellipse2D
-{
-
-public:
-  Ellipse2D$Double();
-  Ellipse2D$Double(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jdouble getHeight();
-  virtual jdouble getWidth();
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jboolean isEmpty();
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Ellipse2D)))) height;
-  jdouble width;
-  jdouble x;
-  jdouble y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Ellipse2D$Double__
diff --git a/libjava/java/awt/geom/Ellipse2D$Float.h b/libjava/java/awt/geom/Ellipse2D$Float.h
deleted file mode 100644
index 52177dc028a..00000000000
--- a/libjava/java/awt/geom/Ellipse2D$Float.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Ellipse2D$Float__
-#define __java_awt_geom_Ellipse2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Ellipse2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Ellipse2D$Float;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Ellipse2D$Float : public ::java::awt::geom::Ellipse2D
-{
-
-public:
-  Ellipse2D$Float();
-  Ellipse2D$Float(jfloat, jfloat, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jdouble getHeight();
-  virtual jdouble getWidth();
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jboolean isEmpty();
-  virtual void setFrame(jfloat, jfloat, jfloat, jfloat);
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Ellipse2D)))) height;
-  jfloat width;
-  jfloat x;
-  jfloat y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Ellipse2D$Float__
diff --git a/libjava/java/awt/geom/Ellipse2D.h b/libjava/java/awt/geom/Ellipse2D.h
deleted file mode 100644
index a78c318d8b3..00000000000
--- a/libjava/java/awt/geom/Ellipse2D.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Ellipse2D__
-#define __java_awt_geom_Ellipse2D__
-
-#pragma interface
-
-#include <java/awt/geom/RectangularShape.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Ellipse2D;
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Ellipse2D : public ::java::awt::geom::RectangularShape
-{
-
-public: // actually protected
-  Ellipse2D();
-public:
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Ellipse2D__
diff --git a/libjava/java/awt/geom/FlatteningPathIterator.h b/libjava/java/awt/geom/FlatteningPathIterator.h
deleted file mode 100644
index 7936286da87..00000000000
--- a/libjava/java/awt/geom/FlatteningPathIterator.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_FlatteningPathIterator__
-#define __java_awt_geom_FlatteningPathIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class FlatteningPathIterator;
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::FlatteningPathIterator : public ::java::lang::Object
-{
-
-public:
-  FlatteningPathIterator(::java::awt::geom::PathIterator *, jdouble);
-  FlatteningPathIterator(::java::awt::geom::PathIterator *, jdouble, jint);
-  virtual jdouble getFlatness();
-  virtual jint getRecursionLimit();
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jdouble > *);
-  virtual jint currentSegment(JArray< jfloat > *);
-private:
-  void fetchSegment();
-  void subdivideQuadratic();
-  void subdivideCubic();
-  ::java::awt::geom::PathIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) srcIter;
-  jdouble flatnessSq;
-  jint recursionLimit;
-  JArray< jdouble > * stack;
-  jint stackSize;
-  JArray< jint > * recLevel;
-  JArray< jdouble > * scratch;
-  jint srcSegType;
-  jdouble srcPosX;
-  jdouble srcPosY;
-  jboolean done;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_FlatteningPathIterator__
diff --git a/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h b/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h
deleted file mode 100644
index 9bf63bd5fe6..00000000000
--- a/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_GeneralPath$GeneralPathIterator__
-#define __java_awt_geom_GeneralPath$GeneralPathIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class GeneralPath$GeneralPathIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::GeneralPath$GeneralPathIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GeneralPath$GeneralPathIterator(::java::awt::geom::GeneralPath *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint currentSegment(JArray< jdouble > *);
-private:
-  static JArray< jint > * NUM_COORDS;
-public: // actually package-private
-  ::java::awt::geom::GeneralPath * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
-private:
-  ::java::awt::geom::AffineTransform * transform;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_GeneralPath$GeneralPathIterator__
diff --git a/libjava/java/awt/geom/GeneralPath.h b/libjava/java/awt/geom/GeneralPath.h
deleted file mode 100644
index a2d37c73f87..00000000000
--- a/libjava/java/awt/geom/GeneralPath.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_GeneralPath__
-#define __java_awt_geom_GeneralPath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::GeneralPath : public ::java::lang::Object
-{
-
-public:
-  GeneralPath();
-  GeneralPath(jint);
-  GeneralPath(jint, jint);
-  GeneralPath(::java::awt::Shape *);
-  void moveTo(jfloat, jfloat);
-  void lineTo(jfloat, jfloat);
-  void quadTo(jfloat, jfloat, jfloat, jfloat);
-  void curveTo(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  void closePath();
-  void append(::java::awt::Shape *, jboolean);
-  void append(::java::awt::geom::PathIterator *, jboolean);
-  jint getWindingRule();
-  void setWindingRule(jint);
-  ::java::awt::geom::Point2D * getCurrentPoint();
-  void reset();
-  void transform(::java::awt::geom::AffineTransform *);
-  ::java::awt::Shape * createTransformedShape(::java::awt::geom::AffineTransform *);
-  ::java::awt::Rectangle * getBounds();
-  ::java::awt::geom::Rectangle2D * getBounds2D();
-  jboolean contains(jdouble, jdouble);
-  jboolean contains(::java::awt::geom::Point2D *);
-  jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  jboolean contains(::java::awt::geom::Rectangle2D *);
-  jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  jboolean intersects(::java::awt::geom::Rectangle2D *);
-  ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  ::java::lang::Object * clone();
-private:
-  void ensureSize(jint);
-  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
-  jint getWindingNumber(jdouble, jdouble);
-  jint evaluateCrossings(jdouble, jdouble, jboolean, jboolean, jdouble);
-public:
-  static const jint WIND_EVEN_ODD = 0;
-  static const jint WIND_NON_ZERO = 1;
-private:
-  static const jint INIT_SIZE = 10;
-  static jdouble BIG_VALUE;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) rule;
-  JArray< jbyte > * types;
-  JArray< jfloat > * xpoints;
-  JArray< jfloat > * ypoints;
-private:
-  jint subpath;
-public: // actually package-private
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_GeneralPath__
diff --git a/libjava/java/awt/geom/IllegalPathStateException.h b/libjava/java/awt/geom/IllegalPathStateException.h
deleted file mode 100644
index 4147334fdc3..00000000000
--- a/libjava/java/awt/geom/IllegalPathStateException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_IllegalPathStateException__
-#define __java_awt_geom_IllegalPathStateException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class IllegalPathStateException;
-      }
-    }
-  }
-}
-
-class java::awt::geom::IllegalPathStateException : public ::java::lang::RuntimeException
-{
-
-public:
-  IllegalPathStateException();
-  IllegalPathStateException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5158084205220481094LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_IllegalPathStateException__
diff --git a/libjava/java/awt/geom/Line2D$1.h b/libjava/java/awt/geom/Line2D$1.h
deleted file mode 100644
index 236ed0c96b6..00000000000
--- a/libjava/java/awt/geom/Line2D$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Line2D$1__
-#define __java_awt_geom_Line2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Line2D;
-          class Line2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Line2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Line2D$1(::java::awt::geom::Line2D *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-public: // actually package-private
-  ::java::awt::geom::Line2D * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Line2D$1__
diff --git a/libjava/java/awt/geom/Line2D$Double.h b/libjava/java/awt/geom/Line2D$Double.h
deleted file mode 100644
index a9915b73d8c..00000000000
--- a/libjava/java/awt/geom/Line2D$Double.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Line2D$Double__
-#define __java_awt_geom_Line2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Line2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Line2D$Double;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Line2D$Double : public ::java::awt::geom::Line2D
-{
-
-public:
-  Line2D$Double();
-  Line2D$Double(jdouble, jdouble, jdouble, jdouble);
-  Line2D$Double(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setLine(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Line2D)))) x1;
-  jdouble y1;
-  jdouble x2;
-  jdouble y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Line2D$Double__
diff --git a/libjava/java/awt/geom/Line2D$Float.h b/libjava/java/awt/geom/Line2D$Float.h
deleted file mode 100644
index 1a829e2c62f..00000000000
--- a/libjava/java/awt/geom/Line2D$Float.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Line2D$Float__
-#define __java_awt_geom_Line2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Line2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Line2D$Float;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Line2D$Float : public ::java::awt::geom::Line2D
-{
-
-public:
-  Line2D$Float();
-  Line2D$Float(jfloat, jfloat, jfloat, jfloat);
-  Line2D$Float(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setLine(jdouble, jdouble, jdouble, jdouble);
-  virtual void setLine(jfloat, jfloat, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Line2D)))) x1;
-  jfloat y1;
-  jfloat x2;
-  jfloat y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Line2D$Float__
diff --git a/libjava/java/awt/geom/Line2D.h b/libjava/java/awt/geom/Line2D.h
deleted file mode 100644
index 5310eadc7de..00000000000
--- a/libjava/java/awt/geom/Line2D.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Line2D__
-#define __java_awt_geom_Line2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class Line2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Line2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  Line2D();
-public:
-  virtual jdouble getX1() = 0;
-  virtual jdouble getY1() = 0;
-  virtual ::java::awt::geom::Point2D * getP1() = 0;
-  virtual jdouble getX2() = 0;
-  virtual jdouble getY2() = 0;
-  virtual ::java::awt::geom::Point2D * getP2() = 0;
-  virtual void setLine(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setLine(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setLine(::java::awt::geom::Line2D *);
-  static jint relativeCCW(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jint relativeCCW(jdouble, jdouble);
-  virtual jint relativeCCW(::java::awt::geom::Point2D *);
-private:
-  static jdouble area2(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jboolean between(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-public:
-  static jboolean linesIntersect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersectsLine(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersectsLine(::java::awt::geom::Line2D *);
-  static jdouble ptSegDistSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble ptSegDist(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble ptSegDistSq(jdouble, jdouble);
-  virtual jdouble ptSegDistSq(::java::awt::geom::Point2D *);
-  virtual jdouble ptSegDist(jdouble, jdouble);
-  virtual jdouble ptSegDist(::java::awt::geom::Point2D *);
-  static jdouble ptLineDistSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble ptLineDist(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble ptLineDistSq(jdouble, jdouble);
-  virtual jdouble ptLineDistSq(::java::awt::geom::Point2D *);
-  virtual jdouble ptLineDist(jdouble, jdouble);
-  virtual jdouble ptLineDist(::java::awt::geom::Point2D *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Line2D__
diff --git a/libjava/java/awt/geom/NoninvertibleTransformException.h b/libjava/java/awt/geom/NoninvertibleTransformException.h
deleted file mode 100644
index 1e7b71249ef..00000000000
--- a/libjava/java/awt/geom/NoninvertibleTransformException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_NoninvertibleTransformException__
-#define __java_awt_geom_NoninvertibleTransformException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class NoninvertibleTransformException;
-      }
-    }
-  }
-}
-
-class java::awt::geom::NoninvertibleTransformException : public ::java::lang::Exception
-{
-
-public:
-  NoninvertibleTransformException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6137225240503990466LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_NoninvertibleTransformException__
diff --git a/libjava/java/awt/geom/PathIterator.h b/libjava/java/awt/geom/PathIterator.h
deleted file mode 100644
index a201f5604b9..00000000000
--- a/libjava/java/awt/geom/PathIterator.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_PathIterator__
-#define __java_awt_geom_PathIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::PathIterator : public ::java::lang::Object
-{
-
-public:
-  virtual jint getWindingRule() = 0;
-  virtual jboolean isDone() = 0;
-  virtual void next() = 0;
-  virtual jint currentSegment(JArray< jfloat > *) = 0;
-  virtual jint currentSegment(JArray< jdouble > *) = 0;
-  static const jint WIND_EVEN_ODD = 0;
-  static const jint WIND_NON_ZERO = 1;
-  static const jint SEG_MOVETO = 0;
-  static const jint SEG_LINETO = 1;
-  static const jint SEG_QUADTO = 2;
-  static const jint SEG_CUBICTO = 3;
-  static const jint SEG_CLOSE = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_geom_PathIterator__
diff --git a/libjava/java/awt/geom/Point2D$Double.h b/libjava/java/awt/geom/Point2D$Double.h
deleted file mode 100644
index b03db3fa76e..00000000000
--- a/libjava/java/awt/geom/Point2D$Double.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Point2D$Double__
-#define __java_awt_geom_Point2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Point2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D$Double;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Point2D$Double : public ::java::awt::geom::Point2D
-{
-
-public:
-  Point2D$Double();
-  Point2D$Double(jdouble, jdouble);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual void setLocation(jdouble, jdouble);
-  virtual ::java::lang::String * toString();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Point2D)))) x;
-  jdouble y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Point2D$Double__
diff --git a/libjava/java/awt/geom/Point2D$Float.h b/libjava/java/awt/geom/Point2D$Float.h
deleted file mode 100644
index f9da3d1be24..00000000000
--- a/libjava/java/awt/geom/Point2D$Float.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Point2D$Float__
-#define __java_awt_geom_Point2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Point2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D$Float;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Point2D$Float : public ::java::awt::geom::Point2D
-{
-
-public:
-  Point2D$Float();
-  Point2D$Float(jfloat, jfloat);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual void setLocation(jdouble, jdouble);
-  virtual void setLocation(jfloat, jfloat);
-  virtual ::java::lang::String * toString();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Point2D)))) x;
-  jfloat y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Point2D$Float__
diff --git a/libjava/java/awt/geom/Point2D.h b/libjava/java/awt/geom/Point2D.h
deleted file mode 100644
index bddd3ab87c8..00000000000
--- a/libjava/java/awt/geom/Point2D.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Point2D__
-#define __java_awt_geom_Point2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Point2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  Point2D();
-public:
-  virtual jdouble getX() = 0;
-  virtual jdouble getY() = 0;
-  virtual void setLocation(jdouble, jdouble) = 0;
-  virtual void setLocation(::java::awt::geom::Point2D *);
-  static jdouble distanceSq(jdouble, jdouble, jdouble, jdouble);
-  static jdouble distance(jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble distanceSq(jdouble, jdouble);
-  virtual jdouble distanceSq(::java::awt::geom::Point2D *);
-  virtual jdouble distance(jdouble, jdouble);
-  virtual jdouble distance(::java::awt::geom::Point2D *);
-  virtual ::java::lang::Object * clone();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Point2D__
diff --git a/libjava/java/awt/geom/QuadCurve2D$1.h b/libjava/java/awt/geom/QuadCurve2D$1.h
deleted file mode 100644
index e653cc38848..00000000000
--- a/libjava/java/awt/geom/QuadCurve2D$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_QuadCurve2D$1__
-#define __java_awt_geom_QuadCurve2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class QuadCurve2D;
-          class QuadCurve2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::QuadCurve2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  QuadCurve2D$1(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-public: // actually package-private
-  ::java::awt::geom::QuadCurve2D * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_QuadCurve2D$1__
diff --git a/libjava/java/awt/geom/QuadCurve2D$Double.h b/libjava/java/awt/geom/QuadCurve2D$Double.h
deleted file mode 100644
index 91a524b0d94..00000000000
--- a/libjava/java/awt/geom/QuadCurve2D$Double.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_QuadCurve2D$Double__
-#define __java_awt_geom_QuadCurve2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/QuadCurve2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-          class QuadCurve2D$Double;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::QuadCurve2D$Double : public ::java::awt::geom::QuadCurve2D
-{
-
-public:
-  QuadCurve2D$Double();
-  QuadCurve2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getCtrlX();
-  virtual jdouble getCtrlY();
-  virtual ::java::awt::geom::Point2D * getCtrlPt();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::QuadCurve2D)))) x1;
-  jdouble y1;
-  jdouble ctrlx;
-  jdouble ctrly;
-  jdouble x2;
-  jdouble y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_QuadCurve2D$Double__
diff --git a/libjava/java/awt/geom/QuadCurve2D$Float.h b/libjava/java/awt/geom/QuadCurve2D$Float.h
deleted file mode 100644
index b2f36d62490..00000000000
--- a/libjava/java/awt/geom/QuadCurve2D$Float.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_QuadCurve2D$Float__
-#define __java_awt_geom_QuadCurve2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/QuadCurve2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-          class QuadCurve2D$Float;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::QuadCurve2D$Float : public ::java::awt::geom::QuadCurve2D
-{
-
-public:
-  QuadCurve2D$Float();
-  QuadCurve2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getCtrlX();
-  virtual jdouble getCtrlY();
-  virtual ::java::awt::geom::Point2D * getCtrlPt();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void setCurve(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::QuadCurve2D)))) x1;
-  jfloat y1;
-  jfloat ctrlx;
-  jfloat ctrly;
-  jfloat x2;
-  jfloat y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_QuadCurve2D$Float__
diff --git a/libjava/java/awt/geom/QuadCurve2D.h b/libjava/java/awt/geom/QuadCurve2D.h
deleted file mode 100644
index f9adea41b82..00000000000
--- a/libjava/java/awt/geom/QuadCurve2D.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_QuadCurve2D__
-#define __java_awt_geom_QuadCurve2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Point2D;
-          class QuadCurve2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::QuadCurve2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  QuadCurve2D();
-public:
-  virtual jdouble getX1() = 0;
-  virtual jdouble getY1() = 0;
-  virtual ::java::awt::geom::Point2D * getP1() = 0;
-  virtual jdouble getCtrlX() = 0;
-  virtual jdouble getCtrlY() = 0;
-  virtual ::java::awt::geom::Point2D * getCtrlPt() = 0;
-  virtual jdouble getX2() = 0;
-  virtual jdouble getY2() = 0;
-  virtual ::java::awt::geom::Point2D * getP2() = 0;
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setCurve(JArray< jdouble > *, jint);
-  virtual void setCurve(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setCurve(JArray< ::java::awt::geom::Point2D * > *, jint);
-  virtual void setCurve(::java::awt::geom::QuadCurve2D *);
-  static jdouble getFlatnessSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble getFlatness(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble getFlatnessSq(JArray< jdouble > *, jint);
-  static jdouble getFlatness(JArray< jdouble > *, jint);
-  virtual jdouble getFlatnessSq();
-  virtual jdouble getFlatness();
-  virtual void subdivide(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *);
-  static void subdivide(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *);
-  static void subdivide(JArray< jdouble > *, jint, JArray< jdouble > *, jint, JArray< jdouble > *, jint);
-  static jint solveQuadratic(JArray< jdouble > *);
-  static jint solveQuadratic(JArray< jdouble > *, JArray< jdouble > *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual ::java::lang::Object * clone();
-private:
-  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
-public:
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-private:
-  static jdouble BIG_VALUE;
-  static jdouble EPSILON;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_QuadCurve2D__
diff --git a/libjava/java/awt/geom/Rectangle2D$1.h b/libjava/java/awt/geom/Rectangle2D$1.h
deleted file mode 100644
index d1b99d21027..00000000000
--- a/libjava/java/awt/geom/Rectangle2D$1.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Rectangle2D$1__
-#define __java_awt_geom_Rectangle2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-          class Rectangle2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Rectangle2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Rectangle2D$1(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jdouble, jdouble, ::java::awt::geom::AffineTransform *);
-public:
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-public: // actually package-private
-  ::java::awt::geom::Rectangle2D * this$0;
-private:
-  jdouble val$maxx;
-  jdouble val$miny;
-  jdouble val$maxy;
-  jdouble val$minx;
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Rectangle2D$1__
diff --git a/libjava/java/awt/geom/Rectangle2D$Double.h b/libjava/java/awt/geom/Rectangle2D$Double.h
deleted file mode 100644
index 20105f932d1..00000000000
--- a/libjava/java/awt/geom/Rectangle2D$Double.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Rectangle2D$Double__
-#define __java_awt_geom_Rectangle2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Rectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Rectangle2D;
-          class Rectangle2D$Double;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Rectangle2D$Double : public ::java::awt::geom::Rectangle2D
-{
-
-public:
-  Rectangle2D$Double();
-  Rectangle2D$Double(jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jboolean isEmpty();
-  virtual void setRect(jdouble, jdouble, jdouble, jdouble);
-  virtual void setRect(::java::awt::geom::Rectangle2D *);
-  virtual jint outcode(jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *);
-  virtual ::java::lang::String * toString();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Rectangle2D)))) x;
-  jdouble y;
-  jdouble width;
-  jdouble height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Rectangle2D$Double__
diff --git a/libjava/java/awt/geom/Rectangle2D$Float.h b/libjava/java/awt/geom/Rectangle2D$Float.h
deleted file mode 100644
index 61dbf373ce4..00000000000
--- a/libjava/java/awt/geom/Rectangle2D$Float.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Rectangle2D$Float__
-#define __java_awt_geom_Rectangle2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Rectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Rectangle2D;
-          class Rectangle2D$Float;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Rectangle2D$Float : public ::java::awt::geom::Rectangle2D
-{
-
-public:
-  Rectangle2D$Float();
-  Rectangle2D$Float(jfloat, jfloat, jfloat, jfloat);
-public: // actually package-private
-  Rectangle2D$Float(jdouble, jdouble, jdouble, jdouble);
-public:
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jboolean isEmpty();
-  virtual void setRect(jfloat, jfloat, jfloat, jfloat);
-  virtual void setRect(jdouble, jdouble, jdouble, jdouble);
-  virtual void setRect(::java::awt::geom::Rectangle2D *);
-  virtual jint outcode(jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *);
-  virtual ::java::lang::String * toString();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Rectangle2D)))) x;
-  jfloat y;
-  jfloat width;
-  jfloat height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Rectangle2D$Float__
diff --git a/libjava/java/awt/geom/Rectangle2D.h b/libjava/java/awt/geom/Rectangle2D.h
deleted file mode 100644
index e81e0a8e161..00000000000
--- a/libjava/java/awt/geom/Rectangle2D.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Rectangle2D__
-#define __java_awt_geom_Rectangle2D__
-
-#pragma interface
-
-#include <java/awt/geom/RectangularShape.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Line2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Rectangle2D : public ::java::awt::geom::RectangularShape
-{
-
-public: // actually protected
-  Rectangle2D();
-public:
-  virtual void setRect(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setRect(::java::awt::geom::Rectangle2D *);
-  virtual jboolean intersectsLine(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersectsLine(::java::awt::geom::Line2D *);
-  virtual jint outcode(jdouble, jdouble) = 0;
-  virtual jint outcode(::java::awt::geom::Point2D *);
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *) = 0;
-  static void intersect(::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *) = 0;
-  static void union$(::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
-  virtual void add(jdouble, jdouble);
-  virtual void add(::java::awt::geom::Point2D *);
-  virtual void add(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  static const jint OUT_LEFT = 1;
-  static const jint OUT_TOP = 2;
-  static const jint OUT_RIGHT = 4;
-  static const jint OUT_BOTTOM = 8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Rectangle2D__
diff --git a/libjava/java/awt/geom/RectangularShape.h b/libjava/java/awt/geom/RectangularShape.h
deleted file mode 100644
index 18e1360fa0d..00000000000
--- a/libjava/java/awt/geom/RectangularShape.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RectangularShape__
-#define __java_awt_geom_RectangularShape__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class Dimension2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-          class RectangularShape;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RectangularShape : public ::java::lang::Object
-{
-
-public: // actually protected
-  RectangularShape();
-public:
-  virtual jdouble getX() = 0;
-  virtual jdouble getY() = 0;
-  virtual jdouble getWidth() = 0;
-  virtual jdouble getHeight() = 0;
-  virtual jdouble getMinX();
-  virtual jdouble getMinY();
-  virtual jdouble getMaxX();
-  virtual jdouble getMaxY();
-  virtual jdouble getCenterX();
-  virtual jdouble getCenterY();
-  virtual ::java::awt::geom::Rectangle2D * getFrame();
-  virtual jboolean isEmpty() = 0;
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setFrame(::java::awt::geom::Point2D *, ::java::awt::geom::Dimension2D *);
-  virtual void setFrame(::java::awt::geom::Rectangle2D *);
-  virtual void setFrameFromDiagonal(jdouble, jdouble, jdouble, jdouble);
-  virtual void setFrameFromDiagonal(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setFrameFromCenter(jdouble, jdouble, jdouble, jdouble);
-  virtual void setFrameFromCenter(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-  virtual jboolean contains(jdouble, jdouble) = 0;
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RectangularShape__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$1.h b/libjava/java/awt/geom/RoundRectangle2D$1.h
deleted file mode 100644
index 76a82e8711e..00000000000
--- a/libjava/java/awt/geom/RoundRectangle2D$1.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RoundRectangle2D$1__
-#define __java_awt_geom_RoundRectangle2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Arc2D$Double;
-          class PathIterator;
-          class RoundRectangle2D;
-          class RoundRectangle2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RoundRectangle2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RoundRectangle2D$1(::java::awt::geom::RoundRectangle2D *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual jint currentSegment(JArray< jdouble > *);
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-public: // actually package-private
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jdouble y;
-  jdouble w;
-  jdouble h;
-  jdouble arcW;
-  jdouble arcH;
-  ::java::awt::geom::Arc2D$Double * arc;
-  ::java::awt::geom::PathIterator * corner;
-  jint step;
-  ::java::awt::geom::RoundRectangle2D * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RoundRectangle2D$1__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$Double.h b/libjava/java/awt/geom/RoundRectangle2D$Double.h
deleted file mode 100644
index 08010fd4125..00000000000
--- a/libjava/java/awt/geom/RoundRectangle2D$Double.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RoundRectangle2D$Double__
-#define __java_awt_geom_RoundRectangle2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/RoundRectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Rectangle2D;
-          class RoundRectangle2D$Double;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RoundRectangle2D$Double : public ::java::awt::geom::RoundRectangle2D
-{
-
-public:
-  RoundRectangle2D$Double();
-  RoundRectangle2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble getArcHeight();
-  virtual jdouble getArcWidth();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jboolean isEmpty();
-  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::RoundRectangle2D)))) archeight;
-  jdouble arcwidth;
-  jdouble x;
-  jdouble y;
-  jdouble width;
-  jdouble height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RoundRectangle2D$Double__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$Float.h b/libjava/java/awt/geom/RoundRectangle2D$Float.h
deleted file mode 100644
index 184c5f4b161..00000000000
--- a/libjava/java/awt/geom/RoundRectangle2D$Float.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RoundRectangle2D$Float__
-#define __java_awt_geom_RoundRectangle2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/RoundRectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Rectangle2D;
-          class RoundRectangle2D$Float;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RoundRectangle2D$Float : public ::java::awt::geom::RoundRectangle2D
-{
-
-public:
-  RoundRectangle2D$Float();
-  RoundRectangle2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual jdouble getArcHeight();
-  virtual jdouble getArcWidth();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jboolean isEmpty();
-  virtual void setRoundRect(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::RoundRectangle2D)))) archeight;
-  jfloat arcwidth;
-  jfloat x;
-  jfloat y;
-  jfloat width;
-  jfloat height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RoundRectangle2D$Float__
diff --git a/libjava/java/awt/geom/RoundRectangle2D.h b/libjava/java/awt/geom/RoundRectangle2D.h
deleted file mode 100644
index a9092ca5c99..00000000000
--- a/libjava/java/awt/geom/RoundRectangle2D.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RoundRectangle2D__
-#define __java_awt_geom_RoundRectangle2D__
-
-#pragma interface
-
-#include <java/awt/geom/RectangularShape.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class RoundRectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RoundRectangle2D : public ::java::awt::geom::RectangularShape
-{
-
-public:
-  virtual jdouble getArcHeight() = 0;
-  virtual jdouble getArcWidth() = 0;
-  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
-public: // actually protected
-  RoundRectangle2D();
-public:
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  virtual void setRoundRect(::java::awt::geom::RoundRectangle2D *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RoundRectangle2D__
diff --git a/libjava/java/awt/im/InputContext.h b/libjava/java/awt/im/InputContext.h
deleted file mode 100644
index 59c02044abb..00000000000
--- a/libjava/java/awt/im/InputContext.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_InputContext__
-#define __java_awt_im_InputContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-      namespace im
-      {
-          class InputContext;
-        namespace spi
-        {
-            class InputMethod;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::im::InputContext : public ::java::lang::Object
-{
-
-public: // actually protected
-  InputContext();
-public:
-  static ::java::awt::im::InputContext * getInstance();
-  virtual jboolean selectInputMethod(::java::util::Locale *);
-  virtual ::java::util::Locale * getLocale();
-  virtual void setCharacterSubsets(JArray< ::java::lang::Character$Subset * > *);
-  virtual void setCompositionEnabled(jboolean);
-  virtual jboolean isCompositionEnabled();
-  virtual void reconvert();
-  virtual void dispatchEvent(::java::awt::AWTEvent *);
-  virtual void removeNotify(::java::awt::Component *);
-  virtual void endComposition();
-  virtual void dispose();
-  virtual ::java::lang::Object * getInputMethodControlObject();
-private:
-  static ::java::util::ArrayList * descriptors;
-  ::java::awt::im::spi::InputMethod * __attribute__((aligned(__alignof__( ::java::lang::Object)))) im;
-  ::java::util::HashMap * recent;
-  JArray< ::java::lang::Character$Subset * > * subsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_im_InputContext__
diff --git a/libjava/java/awt/im/InputMethodHighlight.h b/libjava/java/awt/im/InputMethodHighlight.h
deleted file mode 100644
index 72eb7452183..00000000000
--- a/libjava/java/awt/im/InputMethodHighlight.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_InputMethodHighlight__
-#define __java_awt_im_InputMethodHighlight__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-    }
-  }
-}
-
-class java::awt::im::InputMethodHighlight : public ::java::lang::Object
-{
-
-public:
-  InputMethodHighlight(jboolean, jint);
-  InputMethodHighlight(jboolean, jint, jint);
-  InputMethodHighlight(jboolean, jint, jint, ::java::util::Map *);
-  virtual jboolean isSelected();
-  virtual jint getState();
-  virtual jint getVariation();
-  virtual ::java::util::Map * getStyle();
-  static const jint RAW_TEXT = 0;
-  static const jint CONVERTED_TEXT = 1;
-  static ::java::awt::im::InputMethodHighlight * UNSELECTED_RAW_TEXT_HIGHLIGHT;
-  static ::java::awt::im::InputMethodHighlight * SELECTED_RAW_TEXT_HIGHLIGHT;
-  static ::java::awt::im::InputMethodHighlight * UNSELECTED_CONVERTED_TEXT_HIGHLIGHT;
-  static ::java::awt::im::InputMethodHighlight * SELECTED_CONVERTED_TEXT_HIGHLIGHT;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) selected;
-  jint state;
-  jint variation;
-  ::java::util::Map * style;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_im_InputMethodHighlight__
diff --git a/libjava/java/awt/im/InputMethodRequests.h b/libjava/java/awt/im/InputMethodRequests.h
deleted file mode 100644
index 4552bc9542e..00000000000
--- a/libjava/java/awt/im/InputMethodRequests.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_InputMethodRequests__
-#define __java_awt_im_InputMethodRequests__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace font
-      {
-          class TextHitInfo;
-      }
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class java::awt::im::InputMethodRequests : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Rectangle * getTextLocation(::java::awt::font::TextHitInfo *) = 0;
-  virtual ::java::awt::font::TextHitInfo * getLocationOffset(jint, jint) = 0;
-  virtual jint getInsertPositionOffset() = 0;
-  virtual ::java::text::AttributedCharacterIterator * getCommittedText(jint, jint, JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  virtual jint getCommittedTextLength() = 0;
-  virtual ::java::text::AttributedCharacterIterator * cancelLatestCommittedText(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  virtual ::java::text::AttributedCharacterIterator * getSelectedText(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_im_InputMethodRequests__
diff --git a/libjava/java/awt/im/InputSubset.h b/libjava/java/awt/im/InputSubset.h
deleted file mode 100644
index 181a6af952f..00000000000
--- a/libjava/java/awt/im/InputSubset.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_InputSubset__
-#define __java_awt_im_InputSubset__
-
-#pragma interface
-
-#include <java/lang/Character$Subset.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace im
-      {
-          class InputSubset;
-      }
-    }
-  }
-}
-
-class java::awt::im::InputSubset : public ::java::lang::Character$Subset
-{
-
-  InputSubset(::java::lang::String *);
-public:
-  static ::java::awt::im::InputSubset * LATIN;
-  static ::java::awt::im::InputSubset * LATIN_DIGITS;
-  static ::java::awt::im::InputSubset * TRADITIONAL_HANZI;
-  static ::java::awt::im::InputSubset * SIMPLIFIED_HANZI;
-  static ::java::awt::im::InputSubset * KANJI;
-  static ::java::awt::im::InputSubset * HANJA;
-  static ::java::awt::im::InputSubset * HALFWIDTH_KATAKANA;
-  static ::java::awt::im::InputSubset * FULLWIDTH_LATIN;
-  static ::java::awt::im::InputSubset * FULLWIDTH_DIGITS;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_im_InputSubset__
diff --git a/libjava/java/awt/im/spi/InputMethod.h b/libjava/java/awt/im/spi/InputMethod.h
deleted file mode 100644
index d48fc67a42e..00000000000
--- a/libjava/java/awt/im/spi/InputMethod.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_spi_InputMethod__
-#define __java_awt_im_spi_InputMethod__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Rectangle;
-      namespace im
-      {
-        namespace spi
-        {
-            class InputMethod;
-            class InputMethodContext;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::im::spi::InputMethod : public ::java::lang::Object
-{
-
-public:
-  virtual void setInputMethodContext(::java::awt::im::spi::InputMethodContext *) = 0;
-  virtual jboolean setLocale(::java::util::Locale *) = 0;
-  virtual ::java::util::Locale * getLocale() = 0;
-  virtual void setCharacterSubsets(JArray< ::java::lang::Character$Subset * > *) = 0;
-  virtual void setCompositionEnabled(jboolean) = 0;
-  virtual jboolean isCompositionEnabled() = 0;
-  virtual void reconvert() = 0;
-  virtual void dispatchEvent(::java::awt::AWTEvent *) = 0;
-  virtual void notifyClientWindowChange(::java::awt::Rectangle *) = 0;
-  virtual void activate() = 0;
-  virtual void deactivate(jboolean) = 0;
-  virtual void hideWindows() = 0;
-  virtual void removeNotify() = 0;
-  virtual void endComposition() = 0;
-  virtual void dispose() = 0;
-  virtual ::java::lang::Object * getControlObject() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_im_spi_InputMethod__
diff --git a/libjava/java/awt/im/spi/InputMethodContext.h b/libjava/java/awt/im/spi/InputMethodContext.h
deleted file mode 100644
index 8dcef0e08c7..00000000000
--- a/libjava/java/awt/im/spi/InputMethodContext.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_spi_InputMethodContext__
-#define __java_awt_im_spi_InputMethodContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Window;
-      namespace font
-      {
-          class TextHitInfo;
-      }
-      namespace im
-      {
-        namespace spi
-        {
-            class InputMethod;
-            class InputMethodContext;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFrame;
-    }
-  }
-}
-
-class java::awt::im::spi::InputMethodContext : public ::java::lang::Object
-{
-
-public:
-  virtual void dispatchInputMethodEvent(jint, ::java::text::AttributedCharacterIterator *, jint, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *) = 0;
-  virtual ::java::awt::Window * createInputMethodWindow(::java::lang::String *, jboolean) = 0;
-  virtual ::javax::swing::JFrame * createInputMethodJFrame(::java::lang::String *, jboolean) = 0;
-  virtual void enableClientWindowNotification(::java::awt::im::spi::InputMethod *, jboolean) = 0;
-  virtual ::java::awt::Rectangle * getTextLocation(::java::awt::font::TextHitInfo *) = 0;
-  virtual ::java::awt::font::TextHitInfo * getLocationOffset(jint, jint) = 0;
-  virtual jint getInsertPositionOffset() = 0;
-  virtual ::java::text::AttributedCharacterIterator * getCommittedText(jint, jint, JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  virtual jint getCommittedTextLength() = 0;
-  virtual ::java::text::AttributedCharacterIterator * cancelLatestCommittedText(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  virtual ::java::text::AttributedCharacterIterator * getSelectedText(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_im_spi_InputMethodContext__
diff --git a/libjava/java/awt/im/spi/InputMethodDescriptor.h b/libjava/java/awt/im/spi/InputMethodDescriptor.h
deleted file mode 100644
index 60d0829fef0..00000000000
--- a/libjava/java/awt/im/spi/InputMethodDescriptor.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_spi_InputMethodDescriptor__
-#define __java_awt_im_spi_InputMethodDescriptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace im
-      {
-        namespace spi
-        {
-            class InputMethod;
-            class InputMethodDescriptor;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::im::spi::InputMethodDescriptor : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::util::Locale * > * getAvailableLocales() = 0;
-  virtual jboolean hasDynamicLocaleList() = 0;
-  virtual ::java::lang::String * getInputMethodDisplayName(::java::util::Locale *, ::java::util::Locale *) = 0;
-  virtual ::java::awt::Image * getInputMethodIcon(::java::util::Locale *) = 0;
-  virtual ::java::awt::im::spi::InputMethod * createInputMethod() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_im_spi_InputMethodDescriptor__
diff --git a/libjava/java/awt/image/AffineTransformOp.h b/libjava/java/awt/image/AffineTransformOp.h
deleted file mode 100644
index be0dee40b3f..00000000000
--- a/libjava/java/awt/image/AffineTransformOp.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_AffineTransformOp__
-#define __java_awt_image_AffineTransformOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class AffineTransformOp;
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::AffineTransformOp : public ::java::lang::Object
-{
-
-public:
-  AffineTransformOp(::java::awt::geom::AffineTransform *, jint);
-  AffineTransformOp(::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual jint getInterpolationType();
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-private:
-  void filterNearest(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-  void filterBilinear(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-  void filterBicubic(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-public:
-  static const jint TYPE_NEAREST_NEIGHBOR = 1;
-  static const jint TYPE_BILINEAR = 2;
-  static const jint TYPE_BICUBIC = 3;
-private:
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) transform;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_AffineTransformOp__
diff --git a/libjava/java/awt/image/AreaAveragingScaleFilter.h b/libjava/java/awt/image/AreaAveragingScaleFilter.h
deleted file mode 100644
index 694ae79a772..00000000000
--- a/libjava/java/awt/image/AreaAveragingScaleFilter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_AreaAveragingScaleFilter__
-#define __java_awt_image_AreaAveragingScaleFilter__
-
-#pragma interface
-
-#include <java/awt/image/ReplicateScaleFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class AreaAveragingScaleFilter;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::AreaAveragingScaleFilter : public ::java::awt::image::ReplicateScaleFilter
-{
-
-public:
-  AreaAveragingScaleFilter(jint, jint);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  JArray< jbyte > * averagePixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jdouble, jdouble, jint);
-  JArray< jint > * averagePixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jdouble, jdouble, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_AreaAveragingScaleFilter__
diff --git a/libjava/java/awt/image/BandCombineOp.h b/libjava/java/awt/image/BandCombineOp.h
deleted file mode 100644
index 0233ef4d3c6..00000000000
--- a/libjava/java/awt/image/BandCombineOp.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BandCombineOp__
-#define __java_awt_image_BandCombineOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BandCombineOp;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::BandCombineOp : public ::java::lang::Object
-{
-
-public:
-  BandCombineOp(JArray< JArray< jfloat > * > *, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual JArray< JArray< jfloat > * > * getMatrix();
-private:
-  ::java::awt::RenderingHints * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hints;
-  JArray< JArray< jfloat > * > * matrix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BandCombineOp__
diff --git a/libjava/java/awt/image/BandedSampleModel.h b/libjava/java/awt/image/BandedSampleModel.h
deleted file mode 100644
index 5eca8194bca..00000000000
--- a/libjava/java/awt/image/BandedSampleModel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BandedSampleModel__
-#define __java_awt_image_BandedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/ComponentSampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BandedSampleModel;
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BandedSampleModel : public ::java::awt::image::ComponentSampleModel
-{
-
-  static JArray< jint > * createBankArray(jint);
-public:
-  BandedSampleModel(jint, jint, jint, jint);
-  BandedSampleModel(jint, jint, jint, jint, JArray< jint > *, JArray< jint > *);
-  ::java::awt::image::DataBuffer * createDataBuffer();
-  ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  jfloat getSampleFloat(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  jdouble getSampleDouble(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jfloat, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jdouble, ::java::awt::image::DataBuffer *);
-  void setSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  ::java::lang::String * toString();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::ComponentSampleModel)))) bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-  jint dataBitOffset;
-  jint elemBits;
-  jint numberOfBits;
-  jint numElems;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BandedSampleModel__
diff --git a/libjava/java/awt/image/BufferStrategy.h b/libjava/java/awt/image/BufferStrategy.h
deleted file mode 100644
index 682e73e073d..00000000000
--- a/libjava/java/awt/image/BufferStrategy.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferStrategy__
-#define __java_awt_image_BufferStrategy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class Graphics;
-      namespace image
-      {
-          class BufferStrategy;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferStrategy : public ::java::lang::Object
-{
-
-public:
-  BufferStrategy();
-  virtual ::java::awt::BufferCapabilities * getCapabilities() = 0;
-  virtual ::java::awt::Graphics * getDrawGraphics() = 0;
-  virtual jboolean contentsLost() = 0;
-  virtual jboolean contentsRestored() = 0;
-  virtual void show() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferStrategy__
diff --git a/libjava/java/awt/image/BufferedImage$1.h b/libjava/java/awt/image/BufferedImage$1.h
deleted file mode 100644
index d14d34ea8d1..00000000000
--- a/libjava/java/awt/image/BufferedImage$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImage$1__
-#define __java_awt_image_BufferedImage$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImage$1;
-          class ImageConsumer;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImage$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BufferedImage$1(::java::awt::image::BufferedImage *);
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumers;
-  ::java::awt::image::BufferedImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImage$1__
diff --git a/libjava/java/awt/image/BufferedImage.h b/libjava/java/awt/image/BufferedImage.h
deleted file mode 100644
index 9c54907a7b5..00000000000
--- a/libjava/java/awt/image/BufferedImage.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImage__
-#define __java_awt_image_BufferedImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Graphics2D;
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class IndexColorModel;
-          class Raster;
-          class SampleModel;
-          class TileObserver;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImage : public ::java::awt::Image
-{
-
-public:
-  BufferedImage(jint, jint, jint);
-  BufferedImage(jint, jint, jint, ::java::awt::image::IndexColorModel *);
-  BufferedImage(::java::awt::image::ColorModel *, ::java::awt::image::WritableRaster *, jboolean, ::java::util::Hashtable *);
-private:
-  void init(::java::awt::image::ColorModel *, ::java::awt::image::WritableRaster *, jboolean, ::java::util::Hashtable *, jint);
-  ::java::awt::image::IndexColorModel * createDefaultIndexedColorModel(jboolean);
-public:
-  virtual void coerceData(jboolean);
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *);
-  virtual ::java::awt::Graphics2D * createGraphics();
-  virtual void flush();
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getData();
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jint getHeight();
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual jint getMinTileX();
-  virtual jint getMinTileY();
-  virtual jint getMinX();
-  virtual jint getMinY();
-  virtual jint getNumXTiles();
-  virtual jint getNumYTiles();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual JArray< ::java::lang::String * > * getPropertyNames();
-  virtual jint getRGB(jint, jint);
-  virtual JArray< jint > * getRGB(jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  virtual ::java::awt::image::WritableRaster * getRaster();
-  virtual ::java::awt::image::SampleModel * getSampleModel();
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual ::java::util::Vector * getSources();
-  virtual ::java::awt::image::BufferedImage * getSubimage(jint, jint, jint, jint);
-  virtual ::java::awt::image::Raster * getTile(jint, jint);
-  virtual jint getTileGridXOffset();
-  virtual jint getTileGridYOffset();
-  virtual jint getTileHeight();
-  virtual jint getTileWidth();
-  virtual jint getType();
-  virtual jint getWidth();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::WritableRaster * getWritableTile(jint, jint);
-  virtual JArray< ::java::awt::Point * > * getWritableTileIndices();
-  virtual jboolean hasTileWriters();
-  virtual jboolean isAlphaPremultiplied();
-  virtual jboolean isTileWritable(jint, jint);
-  virtual void releaseWritableTile(jint, jint);
-  virtual void setData(::java::awt::image::Raster *);
-  virtual void setRGB(jint, jint, jint);
-  virtual void setRGB(jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  virtual ::java::lang::String * toString();
-  virtual void addTileObserver(::java::awt::image::TileObserver *);
-  virtual void removeTileObserver(::java::awt::image::TileObserver *);
-  virtual jint getTransparency();
-  static const jint TYPE_CUSTOM = 0;
-  static const jint TYPE_INT_RGB = 1;
-  static const jint TYPE_INT_ARGB = 2;
-  static const jint TYPE_INT_ARGB_PRE = 3;
-  static const jint TYPE_INT_BGR = 4;
-  static const jint TYPE_3BYTE_BGR = 5;
-  static const jint TYPE_4BYTE_ABGR = 6;
-  static const jint TYPE_4BYTE_ABGR_PRE = 7;
-  static const jint TYPE_USHORT_565_RGB = 8;
-  static const jint TYPE_USHORT_555_RGB = 9;
-  static const jint TYPE_BYTE_GRAY = 10;
-  static const jint TYPE_USHORT_GRAY = 11;
-  static const jint TYPE_BYTE_BINARY = 12;
-  static const jint TYPE_BYTE_INDEXED = 13;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::Image)))) tileObservers;
-  ::java::awt::image::WritableRaster * raster;
-  ::java::awt::image::ColorModel * colorModel;
-  ::java::util::Hashtable * properties;
-  jboolean isPremultiplied;
-  jint type;
-private:
-  static JArray< ::java::awt::Point * > * tileIndices;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImage__
diff --git a/libjava/java/awt/image/BufferedImageFilter.h b/libjava/java/awt/image/BufferedImageFilter.h
deleted file mode 100644
index 08da9be7137..00000000000
--- a/libjava/java/awt/image/BufferedImageFilter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImageFilter__
-#define __java_awt_image_BufferedImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImageFilter;
-          class BufferedImageOp;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  BufferedImageFilter(::java::awt::image::BufferedImageOp *);
-  virtual ::java::awt::image::BufferedImageOp * getBufferedImageOp();
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  ::java::awt::image::BufferedImageOp * __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) op;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImageFilter__
diff --git a/libjava/java/awt/image/BufferedImageOp.h b/libjava/java/awt/image/BufferedImageOp.h
deleted file mode 100644
index 1af69aa02dd..00000000000
--- a/libjava/java/awt/image/BufferedImageOp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImageOp__
-#define __java_awt_image_BufferedImageOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImageOp : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *) = 0;
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *) = 0;
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::RenderingHints * getRenderingHints() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_BufferedImageOp__
diff --git a/libjava/java/awt/image/ByteLookupTable.h b/libjava/java/awt/image/ByteLookupTable.h
deleted file mode 100644
index d34b385b2ef..00000000000
--- a/libjava/java/awt/image/ByteLookupTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ByteLookupTable__
-#define __java_awt_image_ByteLookupTable__
-
-#pragma interface
-
-#include <java/awt/image/LookupTable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ByteLookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::ByteLookupTable : public ::java::awt::image::LookupTable
-{
-
-public:
-  ByteLookupTable(jint, JArray< JArray< jbyte > * > *);
-  ByteLookupTable(jint, JArray< jbyte > *);
-  virtual JArray< JArray< jbyte > * > * getTable();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *);
-  virtual JArray< jbyte > * lookupPixel(JArray< jbyte > *, JArray< jbyte > *);
-private:
-  JArray< JArray< jbyte > * > * __attribute__((aligned(__alignof__( ::java::awt::image::LookupTable)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ByteLookupTable__
diff --git a/libjava/java/awt/image/ColorConvertOp.h b/libjava/java/awt/image/ColorConvertOp.h
deleted file mode 100644
index 6455b46bbb7..00000000000
--- a/libjava/java/awt/image/ColorConvertOp.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorConvertOp__
-#define __java_awt_image_ColorConvertOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace color
-      {
-          class ColorSpace;
-          class ICC_Profile;
-      }
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorConvertOp;
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorConvertOp : public ::java::lang::Object
-{
-
-public:
-  ColorConvertOp(::java::awt::color::ColorSpace *, ::java::awt::RenderingHints *);
-  ColorConvertOp(::java::awt::color::ColorSpace *, ::java::awt::color::ColorSpace *, ::java::awt::RenderingHints *);
-  ColorConvertOp(JArray< ::java::awt::color::ICC_Profile * > *, ::java::awt::RenderingHints *);
-  ColorConvertOp(::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual JArray< ::java::awt::color::ICC_Profile * > * getICC_Profiles();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-private:
-  void copyimage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  void copyraster(::java::awt::image::Raster *, ::java::awt::color::ColorSpace *, ::java::awt::image::WritableRaster *, ::java::awt::color::ColorSpace *);
-  ::java::awt::image::ColorModel * createCompatibleColorModel(::java::awt::image::BufferedImage *, ::java::awt::color::ColorSpace *);
-  ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *, ::java::awt::color::ColorSpace *, jboolean, jint);
-  ::java::awt::RenderingHints * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hints;
-  JArray< ::java::awt::color::ICC_Profile * > * profiles;
-  JArray< ::java::awt::color::ColorSpace * > * spaces;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorConvertOp__
diff --git a/libjava/java/awt/image/ColorModel$SRGBColorModel.h b/libjava/java/awt/image/ColorModel$SRGBColorModel.h
deleted file mode 100644
index 90428c4298b..00000000000
--- a/libjava/java/awt/image/ColorModel$SRGBColorModel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorModel$SRGBColorModel__
-#define __java_awt_image_ColorModel$SRGBColorModel__
-
-#pragma interface
-
-#include <java/awt/image/DirectColorModel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel$SRGBColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorModel$SRGBColorModel : public ::java::awt::image::DirectColorModel
-{
-
-public: // actually package-private
-  ColorModel$SRGBColorModel();
-public:
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorModel$SRGBColorModel__
diff --git a/libjava/java/awt/image/ColorModel.h b/libjava/java/awt/image/ColorModel.h
deleted file mode 100644
index 1eccdc58320..00000000000
--- a/libjava/java/awt/image/ColorModel.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorModel__
-#define __java_awt_image_ColorModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorModel : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static JArray< jint > * nArray(jint, jint);
-  static JArray< jbyte > * nArray(jbyte, jint);
-public:
-  ColorModel(jint);
-public: // actually protected
-  ColorModel(jint, JArray< jint > *, ::java::awt::color::ColorSpace *, jboolean, jboolean, jint, jint);
-public:
-  virtual void finalize();
-  static ::java::awt::image::ColorModel * getRGBdefault();
-  virtual jboolean hasAlpha();
-  virtual jboolean isAlphaPremultiplied();
-  virtual jint getPixelSize();
-  virtual jint getComponentSize(jint);
-  virtual JArray< jint > * getComponentSize();
-  virtual jint getTransparency();
-  virtual jint getNumComponents();
-  virtual jint getNumColorComponents();
-  virtual jint getRed(jint) = 0;
-  virtual jint getGreen(jint) = 0;
-  virtual jint getBlue(jint) = 0;
-  virtual jint getAlpha(jint) = 0;
-  virtual jint getRGB(jint);
-public: // actually package-private
-  virtual jint getPixelFromArray(::java::lang::Object *);
-public:
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual JArray< jint > * getUnnormalizedComponents(JArray< jfloat > *, jint, JArray< jint > *, jint);
-  virtual JArray< jfloat > * getNormalizedComponents(JArray< jint > *, jint, JArray< jfloat > *, jint);
-  virtual JArray< jfloat > * getNormalizedComponents(::java::lang::Object *, JArray< jfloat > *, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual jint getDataElement(JArray< jfloat > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(JArray< jfloat > *, jint, ::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::awt::color::ColorSpace * getColorSpace();
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-public: // actually package-private
-  virtual void coerceDataWorker(::java::awt::image::WritableRaster *, jboolean);
-public:
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual jint getTransferType();
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-public: // actually package-private
-  virtual ::java::lang::String * stringParam();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) pixel_bits;
-  jint transferType;
-public: // actually package-private
-  JArray< jint > * bits;
-  ::java::awt::color::ColorSpace * cspace;
-  jint transparency;
-  jboolean hasAlpha__;
-  jboolean isAlphaPremultiplied__;
-private:
-  static ::java::awt::image::ColorModel * S_RGB_MODEL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorModel__
diff --git a/libjava/java/awt/image/ComponentColorModel.h b/libjava/java/awt/image/ComponentColorModel.h
deleted file mode 100644
index e40ab1d2db1..00000000000
--- a/libjava/java/awt/image/ComponentColorModel.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ComponentColorModel__
-#define __java_awt_image_ComponentColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ComponentColorModel;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ComponentColorModel : public ::java::awt::image::ColorModel
-{
-
-  static jint sum(JArray< jint > *);
-  static JArray< jint > * findBits(::java::awt::color::ColorSpace *, jint, jboolean);
-public:
-  ComponentColorModel(::java::awt::color::ColorSpace *, JArray< jint > *, jboolean, jboolean, jint, jint);
-  ComponentColorModel(::java::awt::color::ColorSpace *, jboolean, jboolean, jint, jint);
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-  virtual jint getRGB(jint);
-private:
-  JArray< jfloat > * getRGBFloat(jint);
-  JArray< jfloat > * getRGBFloat(::java::lang::Object *);
-public:
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-private:
-  jint getRGB(JArray< jfloat > *);
-public:
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-  virtual jboolean equals(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ComponentColorModel__
diff --git a/libjava/java/awt/image/ComponentSampleModel.h b/libjava/java/awt/image/ComponentSampleModel.h
deleted file mode 100644
index 39fe6cdf7e4..00000000000
--- a/libjava/java/awt/image/ComponentSampleModel.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ComponentSampleModel__
-#define __java_awt_image_ComponentSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ComponentSampleModel;
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::ComponentSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  ComponentSampleModel(jint, jint, jint, jint, jint, JArray< jint > *);
-  ComponentSampleModel(jint, jint, jint, jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual jint getOffset(jint, jint);
-  virtual jint getOffset(jint, jint, jint);
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual JArray< jint > * getBankIndices();
-  virtual JArray< jint > * getBandOffsets();
-  virtual jint getScanlineStride();
-  virtual jint getPixelStride();
-  virtual jint getNumDataElements();
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-public: // actually protected
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) bandOffsets;
-  JArray< jint > * bankIndices;
-  jint numBands;
-  jint numBanks;
-  jint scanlineStride;
-  jint pixelStride;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ComponentSampleModel__
diff --git a/libjava/java/awt/image/ConvolveOp.h b/libjava/java/awt/image/ConvolveOp.h
deleted file mode 100644
index e72a7033e62..00000000000
--- a/libjava/java/awt/image/ConvolveOp.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ConvolveOp__
-#define __java_awt_image_ConvolveOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ConvolveOp;
-          class Kernel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ConvolveOp : public ::java::lang::Object
-{
-
-public:
-  ConvolveOp(::java::awt::image::Kernel *, jint, ::java::awt::RenderingHints *);
-  ConvolveOp(::java::awt::image::Kernel *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual jint getEdgeCondition();
-  virtual ::java::awt::image::Kernel * getKernel();
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-private:
-  void fillEdge(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, jint, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  static const jint EDGE_ZERO_FILL = 0;
-  static const jint EDGE_NO_OP = 1;
-private:
-  ::java::awt::image::Kernel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kernel;
-  jint edge;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ConvolveOp__
diff --git a/libjava/java/awt/image/CropImageFilter.h b/libjava/java/awt/image/CropImageFilter.h
deleted file mode 100644
index 23720dbdca3..00000000000
--- a/libjava/java/awt/image/CropImageFilter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_CropImageFilter__
-#define __java_awt_image_CropImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class CropImageFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::CropImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  CropImageFilter(jint, jint, jint, jint);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) x;
-  jint y;
-  jint width;
-  jint height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_CropImageFilter__
diff --git a/libjava/java/awt/image/DataBuffer.h b/libjava/java/awt/image/DataBuffer.h
deleted file mode 100644
index 5bb4ac2933c..00000000000
--- a/libjava/java/awt/image/DataBuffer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBuffer__
-#define __java_awt_image_DataBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBuffer : public ::java::lang::Object
-{
-
-public: // actually protected
-  DataBuffer(jint, jint);
-  DataBuffer(jint, jint, jint);
-  DataBuffer(jint, jint, jint, jint);
-  DataBuffer(jint, jint, jint, JArray< jint > *);
-public:
-  static jint getDataTypeSize(jint);
-  virtual jint getDataType();
-  virtual jint getSize();
-  virtual jint getOffset();
-  virtual JArray< jint > * getOffsets();
-  virtual jint getNumBanks();
-  virtual jint getElem(jint);
-  virtual jint getElem(jint, jint) = 0;
-  virtual void setElem(jint, jint);
-  virtual void setElem(jint, jint, jint) = 0;
-  virtual jfloat getElemFloat(jint);
-  virtual jfloat getElemFloat(jint, jint);
-  virtual void setElemFloat(jint, jfloat);
-  virtual void setElemFloat(jint, jint, jfloat);
-  virtual jdouble getElemDouble(jint);
-  virtual jdouble getElemDouble(jint, jint);
-  virtual void setElemDouble(jint, jdouble);
-  virtual void setElemDouble(jint, jint, jdouble);
-  static const jint TYPE_BYTE = 0;
-  static const jint TYPE_USHORT = 1;
-  static const jint TYPE_SHORT = 2;
-  static const jint TYPE_INT = 3;
-  static const jint TYPE_FLOAT = 4;
-  static const jint TYPE_DOUBLE = 5;
-  static const jint TYPE_UNDEFINED = 32;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) dataType;
-  jint banks;
-  jint offset;
-  jint size;
-  JArray< jint > * offsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBuffer__
diff --git a/libjava/java/awt/image/DataBufferByte.h b/libjava/java/awt/image/DataBufferByte.h
deleted file mode 100644
index 224be27ce29..00000000000
--- a/libjava/java/awt/image/DataBufferByte.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferByte__
-#define __java_awt_image_DataBufferByte__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferByte;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferByte : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferByte(jint);
-  DataBufferByte(jint, jint);
-  DataBufferByte(JArray< jbyte > *, jint);
-  DataBufferByte(JArray< jbyte > *, jint, jint);
-  DataBufferByte(JArray< JArray< jbyte > * > *, jint);
-  DataBufferByte(JArray< JArray< jbyte > * > *, jint, JArray< jint > *);
-  JArray< jbyte > * getData();
-  JArray< jbyte > * getData(jint);
-  JArray< JArray< jbyte > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jbyte > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferByte__
diff --git a/libjava/java/awt/image/DataBufferDouble.h b/libjava/java/awt/image/DataBufferDouble.h
deleted file mode 100644
index 056c5e4bbf0..00000000000
--- a/libjava/java/awt/image/DataBufferDouble.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferDouble__
-#define __java_awt_image_DataBufferDouble__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferDouble;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferDouble : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferDouble(jint);
-  DataBufferDouble(jint, jint);
-  DataBufferDouble(JArray< jdouble > *, jint);
-  DataBufferDouble(JArray< jdouble > *, jint, jint);
-  DataBufferDouble(JArray< JArray< jdouble > * > *, jint);
-  DataBufferDouble(JArray< JArray< jdouble > * > *, jint, JArray< jint > *);
-  JArray< jdouble > * getData();
-  JArray< jdouble > * getData(jint);
-  JArray< JArray< jdouble > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-  jfloat getElemFloat(jint);
-  jfloat getElemFloat(jint, jint);
-  void setElemFloat(jint, jfloat);
-  void setElemFloat(jint, jint, jfloat);
-  jdouble getElemDouble(jint);
-  jdouble getElemDouble(jint, jint);
-  void setElemDouble(jint, jdouble);
-  void setElemDouble(jint, jint, jdouble);
-private:
-  JArray< jdouble > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jdouble > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferDouble__
diff --git a/libjava/java/awt/image/DataBufferFloat.h b/libjava/java/awt/image/DataBufferFloat.h
deleted file mode 100644
index 621e3593f94..00000000000
--- a/libjava/java/awt/image/DataBufferFloat.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferFloat__
-#define __java_awt_image_DataBufferFloat__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferFloat;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferFloat : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferFloat(jint);
-  DataBufferFloat(jint, jint);
-  DataBufferFloat(JArray< jfloat > *, jint);
-  DataBufferFloat(JArray< jfloat > *, jint, jint);
-  DataBufferFloat(JArray< JArray< jfloat > * > *, jint);
-  DataBufferFloat(JArray< JArray< jfloat > * > *, jint, JArray< jint > *);
-  JArray< jfloat > * getData();
-  JArray< jfloat > * getData(jint);
-  JArray< JArray< jfloat > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-  jfloat getElemFloat(jint);
-  jfloat getElemFloat(jint, jint);
-  void setElemFloat(jint, jfloat);
-  void setElemFloat(jint, jint, jfloat);
-  jdouble getElemDouble(jint);
-  jdouble getElemDouble(jint, jint);
-  void setElemDouble(jint, jdouble);
-  void setElemDouble(jint, jint, jdouble);
-private:
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jfloat > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferFloat__
diff --git a/libjava/java/awt/image/DataBufferInt.h b/libjava/java/awt/image/DataBufferInt.h
deleted file mode 100644
index 0526f607fa4..00000000000
--- a/libjava/java/awt/image/DataBufferInt.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferInt__
-#define __java_awt_image_DataBufferInt__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferInt;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferInt : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferInt(jint);
-  DataBufferInt(jint, jint);
-  DataBufferInt(JArray< jint > *, jint);
-  DataBufferInt(JArray< jint > *, jint, jint);
-  DataBufferInt(JArray< JArray< jint > * > *, jint);
-  DataBufferInt(JArray< JArray< jint > * > *, jint, JArray< jint > *);
-  JArray< jint > * getData();
-  JArray< jint > * getData(jint);
-  JArray< JArray< jint > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jint > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferInt__
diff --git a/libjava/java/awt/image/DataBufferShort.h b/libjava/java/awt/image/DataBufferShort.h
deleted file mode 100644
index c66067109a1..00000000000
--- a/libjava/java/awt/image/DataBufferShort.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferShort__
-#define __java_awt_image_DataBufferShort__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferShort;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferShort : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferShort(jint);
-  DataBufferShort(jint, jint);
-  DataBufferShort(JArray< jshort > *, jint);
-  DataBufferShort(JArray< jshort > *, jint, jint);
-  DataBufferShort(JArray< JArray< jshort > * > *, jint);
-  DataBufferShort(JArray< JArray< jshort > * > *, jint, JArray< jint > *);
-  JArray< jshort > * getData();
-  JArray< jshort > * getData(jint);
-  JArray< JArray< jshort > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jshort > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferShort__
diff --git a/libjava/java/awt/image/DataBufferUShort.h b/libjava/java/awt/image/DataBufferUShort.h
deleted file mode 100644
index e67d26b1bf3..00000000000
--- a/libjava/java/awt/image/DataBufferUShort.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferUShort__
-#define __java_awt_image_DataBufferUShort__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferUShort;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferUShort : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferUShort(jint);
-  DataBufferUShort(jint, jint);
-  DataBufferUShort(JArray< jshort > *, jint);
-  DataBufferUShort(JArray< jshort > *, jint, jint);
-  DataBufferUShort(JArray< JArray< jshort > * > *, jint);
-  DataBufferUShort(JArray< JArray< jshort > * > *, jint, JArray< jint > *);
-  JArray< jshort > * getData();
-  JArray< jshort > * getData(jint);
-  JArray< JArray< jshort > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jshort > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferUShort__
diff --git a/libjava/java/awt/image/DirectColorModel.h b/libjava/java/awt/image/DirectColorModel.h
deleted file mode 100644
index 476ab073d62..00000000000
--- a/libjava/java/awt/image/DirectColorModel.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DirectColorModel__
-#define __java_awt_image_DirectColorModel__
-
-#pragma interface
-
-#include <java/awt/image/PackedColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class DirectColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::DirectColorModel : public ::java::awt::image::PackedColorModel
-{
-
-public:
-  DirectColorModel(jint, jint, jint, jint);
-  DirectColorModel(jint, jint, jint, jint, jint);
-  DirectColorModel(::java::awt::color::ColorSpace *, jint, jint, jint, jint, jint, jboolean, jint);
-  virtual jint getRedMask();
-  virtual jint getGreenMask();
-  virtual jint getBlueMask();
-  virtual jint getAlphaMask();
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-private:
-  jint extractAndNormalizeSample(jint, jint);
-  jint extractAndScaleSample(jint, jint);
-public:
-  virtual jint getRGB(jint);
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-private:
-  jint valueToField(jint, jint, jint);
-  jint value16ToField(jint, jint);
-public:
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-public: // actually package-private
-  virtual ::java::lang::String * stringParam();
-public:
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DirectColorModel__
diff --git a/libjava/java/awt/image/FilteredImageSource.h b/libjava/java/awt/image/FilteredImageSource.h
deleted file mode 100644
index 93174c44f3c..00000000000
--- a/libjava/java/awt/image/FilteredImageSource.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_FilteredImageSource__
-#define __java_awt_image_FilteredImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class FilteredImageSource;
-          class ImageConsumer;
-          class ImageFilter;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::FilteredImageSource : public ::java::lang::Object
-{
-
-public:
-  FilteredImageSource(::java::awt::image::ImageProducer *, ::java::awt::image::ImageFilter *);
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-public: // actually package-private
-  ::java::awt::image::ImageProducer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ip;
-  ::java::awt::image::ImageFilter * filter;
-  ::java::util::Hashtable * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_FilteredImageSource__
diff --git a/libjava/java/awt/image/ImageConsumer.h b/libjava/java/awt/image/ImageConsumer.h
deleted file mode 100644
index ffca9fc3cad..00000000000
--- a/libjava/java/awt/image/ImageConsumer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageConsumer__
-#define __java_awt_image_ImageConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageConsumer : public ::java::lang::Object
-{
-
-public:
-  virtual void setDimensions(jint, jint) = 0;
-  virtual void setProperties(::java::util::Hashtable *) = 0;
-  virtual void setColorModel(::java::awt::image::ColorModel *) = 0;
-  virtual void setHints(jint) = 0;
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint) = 0;
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint) = 0;
-  virtual void imageComplete(jint) = 0;
-  static const jint RANDOMPIXELORDER = 1;
-  static const jint TOPDOWNLEFTRIGHT = 2;
-  static const jint COMPLETESCANLINES = 4;
-  static const jint SINGLEPASS = 8;
-  static const jint SINGLEFRAME = 16;
-  static const jint IMAGEERROR = 1;
-  static const jint SINGLEFRAMEDONE = 2;
-  static const jint STATICIMAGEDONE = 3;
-  static const jint IMAGEABORTED = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageConsumer__
diff --git a/libjava/java/awt/image/ImageFilter.h b/libjava/java/awt/image/ImageFilter.h
deleted file mode 100644
index 84b6f53b0e3..00000000000
--- a/libjava/java/awt/image/ImageFilter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageFilter__
-#define __java_awt_image_ImageFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-          class ImageFilter;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageFilter : public ::java::lang::Object
-{
-
-public:
-  ImageFilter();
-  virtual void resendTopDownLeftRight(::java::awt::image::ImageProducer *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::image::ImageFilter * getFilterInstance(::java::awt::image::ImageConsumer *);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual void imageComplete(jint);
-public: // actually protected
-  ::java::awt::image::ImageConsumer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ImageFilter__
diff --git a/libjava/java/awt/image/ImageObserver.h b/libjava/java/awt/image/ImageObserver.h
deleted file mode 100644
index 563666a1a9d..00000000000
--- a/libjava/java/awt/image/ImageObserver.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageObserver__
-#define __java_awt_image_ImageObserver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageObserver : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint) = 0;
-  static const jint WIDTH = 1;
-  static const jint HEIGHT = 2;
-  static const jint PROPERTIES = 4;
-  static const jint SOMEBITS = 8;
-  static const jint FRAMEBITS = 16;
-  static const jint ALLBITS = 32;
-  static const jint ERROR = 64;
-  static const jint ABORT = 128;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageObserver__
diff --git a/libjava/java/awt/image/ImageProducer.h b/libjava/java/awt/image/ImageProducer.h
deleted file mode 100644
index 108f61f49f3..00000000000
--- a/libjava/java/awt/image/ImageProducer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageProducer__
-#define __java_awt_image_ImageProducer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageProducer : public ::java::lang::Object
-{
-
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual void startProduction(::java::awt::image::ImageConsumer *) = 0;
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageProducer__
diff --git a/libjava/java/awt/image/ImagingOpException.h b/libjava/java/awt/image/ImagingOpException.h
deleted file mode 100644
index 9ce51161f2e..00000000000
--- a/libjava/java/awt/image/ImagingOpException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImagingOpException__
-#define __java_awt_image_ImagingOpException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImagingOpException;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImagingOpException : public ::java::lang::RuntimeException
-{
-
-public:
-  ImagingOpException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8026288481846276658LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ImagingOpException__
diff --git a/libjava/java/awt/image/IndexColorModel.h b/libjava/java/awt/image/IndexColorModel.h
deleted file mode 100644
index a79a5312fee..00000000000
--- a/libjava/java/awt/image/IndexColorModel.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_IndexColorModel__
-#define __java_awt_image_IndexColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class IndexColorModel;
-          class Raster;
-          class SampleModel;
-      }
-    }
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class java::awt::image::IndexColorModel : public ::java::awt::image::ColorModel
-{
-
-public:
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, jint);
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  IndexColorModel(jint, jint, JArray< jbyte > *, jint, jboolean);
-  IndexColorModel(jint, jint, JArray< jbyte > *, jint, jboolean, jint);
-  IndexColorModel(jint, jint, JArray< jint > *, jint, jboolean, jint, jint);
-  IndexColorModel(jint, jint, JArray< jint > *, jint, jint, ::java::math::BigInteger *);
-  virtual jint getMapSize();
-  virtual jint getTransparentPixel();
-  virtual void getReds(JArray< jbyte > *);
-  virtual void getGreens(JArray< jbyte > *);
-  virtual void getBlues(JArray< jbyte > *);
-  virtual void getAlphas(JArray< jbyte > *);
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-  virtual jint getRGB(jint);
-  virtual void getRGBs(JArray< jint > *);
-  virtual jboolean isValid(jint);
-  virtual jboolean isValid();
-  virtual ::java::math::BigInteger * getValidPixels();
-  virtual ::java::awt::image::BufferedImage * convertToIntDiscrete(::java::awt::image::Raster *, jboolean);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-private:
-  void setTransparentPixel(jint);
-  JArray< jint > * createColorMap(jint, jint);
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ColorModel)))) map_size;
-  jboolean opaque;
-  jint trans;
-  JArray< jint > * rgb;
-  ::java::math::BigInteger * validBits;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_IndexColorModel__
diff --git a/libjava/java/awt/image/Kernel.h b/libjava/java/awt/image/Kernel.h
deleted file mode 100644
index f0bacc1233c..00000000000
--- a/libjava/java/awt/image/Kernel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_Kernel__
-#define __java_awt_image_Kernel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class Kernel;
-      }
-    }
-  }
-}
-
-class java::awt::image::Kernel : public ::java::lang::Object
-{
-
-public:
-  Kernel(jint, jint, JArray< jfloat > *);
-  virtual jint getXOrigin();
-  virtual jint getYOrigin();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual JArray< jfloat > * getKernelData(JArray< jfloat > *);
-  virtual ::java::lang::Object * clone();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint height;
-  JArray< jfloat > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_Kernel__
diff --git a/libjava/java/awt/image/LookupOp.h b/libjava/java/awt/image/LookupOp.h
deleted file mode 100644
index 07546043f0e..00000000000
--- a/libjava/java/awt/image/LookupOp.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_LookupOp__
-#define __java_awt_image_LookupOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class LookupOp;
-          class LookupTable;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::LookupOp : public ::java::lang::Object
-{
-
-public:
-  LookupOp(::java::awt::image::LookupTable *, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::image::LookupTable * getTable();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-private:
-  ::java::awt::image::LookupTable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lut;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_LookupOp__
diff --git a/libjava/java/awt/image/LookupTable.h b/libjava/java/awt/image/LookupTable.h
deleted file mode 100644
index 2fcd6459230..00000000000
--- a/libjava/java/awt/image/LookupTable.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_LookupTable__
-#define __java_awt_image_LookupTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class LookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::LookupTable : public ::java::lang::Object
-{
-
-public: // actually protected
-  LookupTable(jint, jint);
-public:
-  virtual jint getNumComponents();
-  virtual jint getOffset();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *) = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) offset;
-  jint numComponents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_LookupTable__
diff --git a/libjava/java/awt/image/MemoryImageSource.h b/libjava/java/awt/image/MemoryImageSource.h
deleted file mode 100644
index e717ee87c12..00000000000
--- a/libjava/java/awt/image/MemoryImageSource.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_MemoryImageSource__
-#define __java_awt_image_MemoryImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-          class MemoryImageSource;
-      }
-    }
-  }
-}
-
-class java::awt::image::MemoryImageSource : public ::java::lang::Object
-{
-
-public:
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, JArray< jint > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, JArray< jint > *, jint, jint);
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void setAnimated(jboolean);
-  virtual void setFullBufferUpdates(jboolean);
-  virtual void newPixels();
-private:
-  void sendPicture(::java::awt::image::ImageConsumer *);
-public:
-  virtual void newPixels(jint, jint, jint, jint);
-  virtual void newPixels(jint, jint, jint, jint, jboolean);
-  virtual void newPixels(JArray< jbyte > *, ::java::awt::image::ColorModel *, jint, jint);
-  virtual void newPixels(JArray< jint > *, ::java::awt::image::ColorModel *, jint, jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) animated;
-  jboolean fullbuffers;
-  JArray< jint > * pixeli;
-  jint width;
-  jint height;
-  jint offset;
-  jint scansize;
-  JArray< jbyte > * pixelb;
-  ::java::awt::image::ColorModel * cm;
-  ::java::util::Hashtable * props;
-  ::java::util::Vector * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_MemoryImageSource__
diff --git a/libjava/java/awt/image/MultiPixelPackedSampleModel.h b/libjava/java/awt/image/MultiPixelPackedSampleModel.h
deleted file mode 100644
index 377ceaf1ee9..00000000000
--- a/libjava/java/awt/image/MultiPixelPackedSampleModel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_MultiPixelPackedSampleModel__
-#define __java_awt_image_MultiPixelPackedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class MultiPixelPackedSampleModel;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::MultiPixelPackedSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  MultiPixelPackedSampleModel(jint, jint, jint, jint);
-  MultiPixelPackedSampleModel(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual jint getNumDataElements();
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual jint getOffset(jint, jint);
-  virtual jint getBitOffset(jint);
-  virtual jint getDataBitOffset();
-  virtual jint getScanlineStride();
-  virtual jint getPixelBitStride();
-  virtual jint getTransferType();
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) scanlineStride;
-  JArray< jint > * bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-  jint dataBitOffset;
-  jint elemBits;
-  jint numberOfBits;
-  jint numElems;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_MultiPixelPackedSampleModel__
diff --git a/libjava/java/awt/image/PackedColorModel.h b/libjava/java/awt/image/PackedColorModel.h
deleted file mode 100644
index 2d98aa9e877..00000000000
--- a/libjava/java/awt/image/PackedColorModel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PackedColorModel__
-#define __java_awt_image_PackedColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class PackedColorModel;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::PackedColorModel : public ::java::awt::image::ColorModel
-{
-
-public:
-  PackedColorModel(::java::awt::color::ColorSpace *, jint, JArray< jint > *, jint, jboolean, jint, jint);
-private:
-  static JArray< jint > * calcBitsPerComponent(JArray< jint > *, jint);
-  void initMasks(JArray< jint > *, jint);
-public:
-  PackedColorModel(::java::awt::color::ColorSpace *, jint, jint, jint, jint, jint, jboolean, jint, jint);
-private:
-  static JArray< jint > * makeColorMaskArray(jint, jint, jint);
-public:
-  virtual jint getMask(jint);
-  virtual JArray< jint > * getMasks();
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::ColorModel)))) masks;
-public: // actually package-private
-  JArray< jint > * shifts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PackedColorModel__
diff --git a/libjava/java/awt/image/PixelGrabber$1.h b/libjava/java/awt/image/PixelGrabber$1.h
deleted file mode 100644
index e6271042c25..00000000000
--- a/libjava/java/awt/image/PixelGrabber$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelGrabber$1__
-#define __java_awt_image_PixelGrabber$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class PixelGrabber;
-          class PixelGrabber$1;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelGrabber$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  PixelGrabber$1(::java::awt::image::PixelGrabber *);
-public:
-  virtual void run();
-public: // actually package-private
-  ::java::awt::image::PixelGrabber * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelGrabber$1__
diff --git a/libjava/java/awt/image/PixelGrabber.h b/libjava/java/awt/image/PixelGrabber.h
deleted file mode 100644
index f530f343127..00000000000
--- a/libjava/java/awt/image/PixelGrabber.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelGrabber__
-#define __java_awt_image_PixelGrabber__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace image
-      {
-          class ColorModel;
-          class ImageProducer;
-          class PixelGrabber;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelGrabber : public ::java::lang::Object
-{
-
-public:
-  PixelGrabber(::java::awt::Image *, jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  PixelGrabber(::java::awt::image::ImageProducer *, jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  PixelGrabber(::java::awt::Image *, jint, jint, jint, jint, jboolean);
-  virtual void startGrabbing();
-  virtual void abortGrabbing();
-  virtual jboolean grabPixels();
-  virtual jboolean grabPixels(jlong);
-private:
-  jboolean setObserverStatus();
-public:
-  virtual jint getStatus();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual ::java::lang::Object * getPixels();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void setHints(jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual void imageComplete(jint);
-  virtual jint status();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint offset;
-  jint width;
-  jint height;
-  jint scansize;
-  jboolean forceRGB;
-  ::java::awt::image::ColorModel * model;
-  jint hints;
-  ::java::util::Hashtable * props;
-  JArray< jint > * int_pixel_buffer;
-  jboolean ints_delivered;
-  JArray< jbyte > * byte_pixel_buffer;
-  jboolean bytes_delivered;
-  ::java::awt::image::ImageProducer * ip;
-  jint observerStatus;
-  jint consumerStatus;
-private:
-  ::java::lang::Thread * grabberThread;
-public: // actually package-private
-  jboolean grabbing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelGrabber__
diff --git a/libjava/java/awt/image/PixelInterleavedSampleModel.h b/libjava/java/awt/image/PixelInterleavedSampleModel.h
deleted file mode 100644
index 42ba5821751..00000000000
--- a/libjava/java/awt/image/PixelInterleavedSampleModel.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelInterleavedSampleModel__
-#define __java_awt_image_PixelInterleavedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/ComponentSampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class PixelInterleavedSampleModel;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelInterleavedSampleModel : public ::java::awt::image::ComponentSampleModel
-{
-
-public:
-  PixelInterleavedSampleModel(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelInterleavedSampleModel__
diff --git a/libjava/java/awt/image/RGBImageFilter.h b/libjava/java/awt/image/RGBImageFilter.h
deleted file mode 100644
index 34aea655ff6..00000000000
--- a/libjava/java/awt/image/RGBImageFilter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RGBImageFilter__
-#define __java_awt_image_RGBImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class IndexColorModel;
-          class RGBImageFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::RGBImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  RGBImageFilter();
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void substituteColorModel(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::IndexColorModel * filterIndexColorModel(::java::awt::image::IndexColorModel *);
-  virtual void filterRGBPixels(jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  virtual jint filterRGB(jint, jint, jint) = 0;
-public: // actually protected
-  ::java::awt::image::ColorModel * __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) origmodel;
-  ::java::awt::image::ColorModel * newmodel;
-  jboolean canFilterIndexColorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RGBImageFilter__
diff --git a/libjava/java/awt/image/Raster.h b/libjava/java/awt/image/Raster.h
deleted file mode 100644
index 2c187d5af3f..00000000000
--- a/libjava/java/awt/image/Raster.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_Raster__
-#define __java_awt_image_Raster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class DataBuffer;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::Raster : public ::java::lang::Object
-{
-
-public: // actually protected
-  Raster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  Raster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  Raster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::image::Raster *);
-public:
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(jint, jint, jint, jint, JArray< jint > *, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(jint, jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, JArray< jint > *, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::Raster * createRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createWritableRaster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createWritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  virtual ::java::awt::image::Raster * getParent();
-  virtual jint getSampleModelTranslateX();
-  virtual jint getSampleModelTranslateY();
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster();
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(::java::awt::Rectangle *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint, jint, jint);
-  virtual ::java::awt::image::Raster * createTranslatedChild(jint, jint);
-  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual jint getMinX();
-  virtual jint getMinY();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getNumBands();
-  virtual jint getNumDataElements();
-  virtual jint getTransferType();
-  virtual ::java::awt::image::DataBuffer * getDataBuffer();
-  virtual ::java::awt::image::SampleModel * getSampleModel();
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getPixel(jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getPixel(jint, jint, JArray< jdouble > *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getPixels(jint, jint, jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getPixels(jint, jint, jint, jint, JArray< jdouble > *);
-  virtual jint getSample(jint, jint, jint);
-  virtual jfloat getSampleFloat(jint, jint, jint);
-  virtual jdouble getSampleDouble(jint, jint, jint);
-  virtual JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getSamples(jint, jint, jint, jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getSamples(jint, jint, jint, jint, jint, JArray< jdouble > *);
-  virtual ::java::lang::String * toString();
-private:
-  static jint getTypeBits(jint);
-public: // actually protected
-  ::java::awt::image::SampleModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sampleModel;
-  ::java::awt::image::DataBuffer * dataBuffer;
-  jint minX;
-  jint minY;
-  jint width;
-  jint height;
-  jint sampleModelTranslateX;
-  jint sampleModelTranslateY;
-  jint numBands;
-  jint numDataElements;
-  ::java::awt::image::Raster * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_Raster__
diff --git a/libjava/java/awt/image/RasterFormatException.h b/libjava/java/awt/image/RasterFormatException.h
deleted file mode 100644
index acfe3941ca8..00000000000
--- a/libjava/java/awt/image/RasterFormatException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RasterFormatException__
-#define __java_awt_image_RasterFormatException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class RasterFormatException;
-      }
-    }
-  }
-}
-
-class java::awt::image::RasterFormatException : public ::java::lang::RuntimeException
-{
-
-public:
-  RasterFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 96598996116164315LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RasterFormatException__
diff --git a/libjava/java/awt/image/RasterOp.h b/libjava/java/awt/image/RasterOp.h
deleted file mode 100644
index a54b9b022f4..00000000000
--- a/libjava/java/awt/image/RasterOp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RasterOp__
-#define __java_awt_image_RasterOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class Raster;
-          class RasterOp;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RasterOp : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *) = 0;
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *) = 0;
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::RenderingHints * getRenderingHints() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_RasterOp__
diff --git a/libjava/java/awt/image/RenderedImage.h b/libjava/java/awt/image/RenderedImage.h
deleted file mode 100644
index f47ca93cc0a..00000000000
--- a/libjava/java/awt/image/RenderedImage.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RenderedImage__
-#define __java_awt_image_RenderedImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class RenderedImage;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RenderedImage : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::SampleModel * getSampleModel() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual jint getMinX() = 0;
-  virtual jint getMinY() = 0;
-  virtual jint getNumXTiles() = 0;
-  virtual jint getNumYTiles() = 0;
-  virtual jint getMinTileX() = 0;
-  virtual jint getMinTileY() = 0;
-  virtual jint getTileWidth() = 0;
-  virtual jint getTileHeight() = 0;
-  virtual jint getTileGridXOffset() = 0;
-  virtual jint getTileGridYOffset() = 0;
-  virtual ::java::awt::image::Raster * getTile(jint, jint) = 0;
-  virtual ::java::awt::image::Raster * getData() = 0;
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_RenderedImage__
diff --git a/libjava/java/awt/image/ReplicateScaleFilter.h b/libjava/java/awt/image/ReplicateScaleFilter.h
deleted file mode 100644
index d518d793f7d..00000000000
--- a/libjava/java/awt/image/ReplicateScaleFilter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ReplicateScaleFilter__
-#define __java_awt_image_ReplicateScaleFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ReplicateScaleFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::ReplicateScaleFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  ReplicateScaleFilter(jint, jint);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-private:
-  void setupSources();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) destHeight;
-  jint destWidth;
-  jint srcHeight;
-  jint srcWidth;
-  JArray< jint > * srcrows;
-  JArray< jint > * srccols;
-  ::java::lang::Object * outpixbuf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ReplicateScaleFilter__
diff --git a/libjava/java/awt/image/RescaleOp.h b/libjava/java/awt/image/RescaleOp.h
deleted file mode 100644
index ba67ec9fc89..00000000000
--- a/libjava/java/awt/image/RescaleOp.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RescaleOp__
-#define __java_awt_image_RescaleOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class RescaleOp;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RescaleOp : public ::java::lang::Object
-{
-
-public:
-  RescaleOp(JArray< jfloat > *, JArray< jfloat > *, ::java::awt::RenderingHints *);
-  RescaleOp(jfloat, jfloat, ::java::awt::RenderingHints *);
-  virtual JArray< jfloat > * getScaleFactors(JArray< jfloat > *);
-  virtual JArray< jfloat > * getOffsets(JArray< jfloat > *);
-  virtual jint getNumFactors();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-private:
-  ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jboolean > *);
-public:
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-private:
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) scale;
-  JArray< jfloat > * offsets;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RescaleOp__
diff --git a/libjava/java/awt/image/SampleModel.h b/libjava/java/awt/image/SampleModel.h
deleted file mode 100644
index 5d51a65d927..00000000000
--- a/libjava/java/awt/image/SampleModel.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_SampleModel__
-#define __java_awt_image_SampleModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::SampleModel : public ::java::lang::Object
-{
-
-public:
-  SampleModel(jint, jint, jint, jint);
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getNumBands();
-  virtual jint getNumDataElements() = 0;
-  virtual jint getDataType();
-  virtual jint getTransferType();
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *) = 0;
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *) = 0;
-  virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getPixel(jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getPixel(jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getPixels(jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getPixels(jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *) = 0;
-  virtual jfloat getSampleFloat(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jdouble getSampleDouble(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getSamples(jint, jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getSamples(jint, jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *) = 0;
-  virtual void setSample(jint, jint, jint, jfloat, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jdouble, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint) = 0;
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *) = 0;
-  virtual ::java::awt::image::DataBuffer * createDataBuffer() = 0;
-  virtual JArray< jint > * getSampleSize() = 0;
-  virtual jint getSampleSize(jint) = 0;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint height;
-  jint numBands;
-  jint dataType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_SampleModel__
diff --git a/libjava/java/awt/image/ShortLookupTable.h b/libjava/java/awt/image/ShortLookupTable.h
deleted file mode 100644
index 053331b0629..00000000000
--- a/libjava/java/awt/image/ShortLookupTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ShortLookupTable__
-#define __java_awt_image_ShortLookupTable__
-
-#pragma interface
-
-#include <java/awt/image/LookupTable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ShortLookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::ShortLookupTable : public ::java::awt::image::LookupTable
-{
-
-public:
-  ShortLookupTable(jint, JArray< JArray< jshort > * > *);
-  ShortLookupTable(jint, JArray< jshort > *);
-  virtual JArray< JArray< jshort > * > * getTable();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *);
-  virtual JArray< jshort > * lookupPixel(JArray< jshort > *, JArray< jshort > *);
-private:
-  JArray< JArray< jshort > * > * __attribute__((aligned(__alignof__( ::java::awt::image::LookupTable)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ShortLookupTable__
diff --git a/libjava/java/awt/image/SinglePixelPackedSampleModel.h b/libjava/java/awt/image/SinglePixelPackedSampleModel.h
deleted file mode 100644
index c7bf07cd4a9..00000000000
--- a/libjava/java/awt/image/SinglePixelPackedSampleModel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_SinglePixelPackedSampleModel__
-#define __java_awt_image_SinglePixelPackedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class SampleModel;
-          class SinglePixelPackedSampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::SinglePixelPackedSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  SinglePixelPackedSampleModel(jint, jint, jint, JArray< jint > *);
-  SinglePixelPackedSampleModel(jint, jint, jint, jint, JArray< jint > *);
-  virtual jint getNumDataElements();
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual jint getOffset(jint, jint);
-  virtual JArray< jint > * getBitOffsets();
-  virtual JArray< jint > * getBitMasks();
-  virtual jint getScanlineStride();
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) scanlineStride;
-  JArray< jint > * bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_SinglePixelPackedSampleModel__
diff --git a/libjava/java/awt/image/TileObserver.h b/libjava/java/awt/image/TileObserver.h
deleted file mode 100644
index 9f7d0a1a4cf..00000000000
--- a/libjava/java/awt/image/TileObserver.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_TileObserver__
-#define __java_awt_image_TileObserver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class TileObserver;
-          class WritableRenderedImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::TileObserver : public ::java::lang::Object
-{
-
-public:
-  virtual void tileUpdate(::java::awt::image::WritableRenderedImage *, jint, jint, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_TileObserver__
diff --git a/libjava/java/awt/image/VolatileImage.h b/libjava/java/awt/image/VolatileImage.h
deleted file mode 100644
index ed289286350..00000000000
--- a/libjava/java/awt/image/VolatileImage.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_VolatileImage__
-#define __java_awt_image_VolatileImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class ImageCapabilities;
-      namespace image
-      {
-          class BufferedImage;
-          class ImageProducer;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::VolatileImage : public ::java::awt::Image
-{
-
-public:
-  VolatileImage();
-  virtual ::java::awt::image::BufferedImage * getSnapshot() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual void flush();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Graphics2D * createGraphics() = 0;
-  virtual jint validate(::java::awt::GraphicsConfiguration *) = 0;
-  virtual jboolean contentsLost() = 0;
-  virtual ::java::awt::ImageCapabilities * getCapabilities() = 0;
-  virtual jint getTransparency();
-  static const jint IMAGE_OK = 0;
-  static const jint IMAGE_RESTORED = 1;
-  static const jint IMAGE_INCOMPATIBLE = 2;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::Image)))) transparency;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_VolatileImage__
diff --git a/libjava/java/awt/image/WritableRaster.h b/libjava/java/awt/image/WritableRaster.h
deleted file mode 100644
index 5db229c332d..00000000000
--- a/libjava/java/awt/image/WritableRaster.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_WritableRaster__
-#define __java_awt_image_WritableRaster__
-
-#pragma interface
-
-#include <java/awt/image/Raster.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class DataBuffer;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::WritableRaster : public ::java::awt::image::Raster
-{
-
-public: // actually protected
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::image::WritableRaster *);
-public:
-  virtual ::java::awt::image::WritableRaster * getWritableParent();
-  virtual ::java::awt::image::WritableRaster * createWritableTranslatedChild(jint, jint);
-  virtual ::java::awt::image::WritableRaster * createWritableChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *);
-  virtual void setDataElements(jint, jint, ::java::awt::image::Raster *);
-  virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *);
-  virtual void setRect(::java::awt::image::Raster *);
-  virtual void setRect(jint, jint, ::java::awt::image::Raster *);
-  virtual void setPixel(jint, jint, JArray< jint > *);
-  virtual void setPixel(jint, jint, JArray< jfloat > *);
-  virtual void setPixel(jint, jint, JArray< jdouble > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jfloat > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jdouble > *);
-  virtual void setSample(jint, jint, jint, jint);
-  virtual void setSample(jint, jint, jint, jfloat);
-  virtual void setSample(jint, jint, jint, jdouble);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jfloat > *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jdouble > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_WritableRaster__
diff --git a/libjava/java/awt/image/WritableRenderedImage.h b/libjava/java/awt/image/WritableRenderedImage.h
deleted file mode 100644
index f9b24812351..00000000000
--- a/libjava/java/awt/image/WritableRenderedImage.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_WritableRenderedImage__
-#define __java_awt_image_WritableRenderedImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class SampleModel;
-          class TileObserver;
-          class WritableRaster;
-          class WritableRenderedImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::WritableRenderedImage : public ::java::lang::Object
-{
-
-public:
-  virtual void addTileObserver(::java::awt::image::TileObserver *) = 0;
-  virtual void removeTileObserver(::java::awt::image::TileObserver *) = 0;
-  virtual ::java::awt::image::WritableRaster * getWritableTile(jint, jint) = 0;
-  virtual void releaseWritableTile(jint, jint) = 0;
-  virtual jboolean isTileWritable(jint, jint) = 0;
-  virtual JArray< ::java::awt::Point * > * getWritableTileIndices() = 0;
-  virtual jboolean hasTileWriters() = 0;
-  virtual void setData(::java::awt::image::Raster *) = 0;
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::SampleModel * getSampleModel() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual jint getMinX() = 0;
-  virtual jint getMinY() = 0;
-  virtual jint getNumXTiles() = 0;
-  virtual jint getNumYTiles() = 0;
-  virtual jint getMinTileX() = 0;
-  virtual jint getMinTileY() = 0;
-  virtual jint getTileWidth() = 0;
-  virtual jint getTileHeight() = 0;
-  virtual jint getTileGridXOffset() = 0;
-  virtual jint getTileGridYOffset() = 0;
-  virtual ::java::awt::image::Raster * getTile(jint, jint) = 0;
-  virtual ::java::awt::image::Raster * getData() = 0;
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_WritableRenderedImage__
diff --git a/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h b/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h
deleted file mode 100644
index d7ac12972d1..00000000000
--- a/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_ContextualRenderedImageFactory__
-#define __java_awt_image_renderable_ContextualRenderedImageFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ContextualRenderedImageFactory;
-            class ParameterBlock;
-            class RenderContext;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::ContextualRenderedImageFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::renderable::RenderContext * mapRenderContext(jint, ::java::awt::image::renderable::RenderContext *, ::java::awt::image::renderable::ParameterBlock *, ::java::awt::image::renderable::RenderableImage *) = 0;
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::RenderContext *, ::java::awt::image::renderable::ParameterBlock *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::renderable::ParameterBlock *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::awt::image::renderable::ParameterBlock *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual jboolean isDynamic() = 0;
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::ParameterBlock *, ::java::awt::RenderingHints *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_ContextualRenderedImageFactory__
diff --git a/libjava/java/awt/image/renderable/ParameterBlock.h b/libjava/java/awt/image/renderable/ParameterBlock.h
deleted file mode 100644
index cafafbdbb43..00000000000
--- a/libjava/java/awt/image/renderable/ParameterBlock.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_ParameterBlock__
-#define __java_awt_image_renderable_ParameterBlock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ParameterBlock;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::ParameterBlock : public ::java::lang::Object
-{
-
-public:
-  ParameterBlock();
-  ParameterBlock(::java::util::Vector *);
-  ParameterBlock(::java::util::Vector *, ::java::util::Vector *);
-  virtual ::java::lang::Object * shallowClone();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::image::renderable::ParameterBlock * addSource(::java::lang::Object *);
-  virtual ::java::lang::Object * getSource(jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * setSource(::java::lang::Object *, jint);
-  virtual ::java::awt::image::RenderedImage * getRenderedSource(jint);
-  virtual ::java::awt::image::renderable::RenderableImage * getRenderableSource(jint);
-  virtual jint getNumSources();
-  virtual ::java::util::Vector * getSources();
-  virtual void setSources(::java::util::Vector *);
-  virtual void removeSources();
-  virtual jint getNumParameters();
-  virtual ::java::util::Vector * getParameters();
-  virtual void setParameters(::java::util::Vector *);
-  virtual void removeParameters();
-  virtual ::java::awt::image::renderable::ParameterBlock * add(::java::lang::Object *);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jbyte);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jchar);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jshort);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jlong);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jfloat);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jdouble);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(::java::lang::Object *, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jbyte, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jchar, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jshort, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jint, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jlong, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jfloat, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jdouble, jint);
-  virtual ::java::lang::Object * getObjectParameter(jint);
-  virtual jbyte getByteParameter(jint);
-  virtual jchar getCharParameter(jint);
-  virtual jshort getShortParameter(jint);
-  virtual jint getIntParameter(jint);
-  virtual jlong getLongParameter(jint);
-  virtual jfloat getFloatParameter(jint);
-  virtual jdouble getDoubleParameter(jint);
-  virtual JArray< ::java::lang::Class * > * getParamClasses();
-private:
-  static const jlong serialVersionUID = -7577115551785240750LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sources;
-  ::java::util::Vector * parameters;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_ParameterBlock__
diff --git a/libjava/java/awt/image/renderable/RenderContext.h b/libjava/java/awt/image/renderable/RenderContext.h
deleted file mode 100644
index 4923ebc2db2..00000000000
--- a/libjava/java/awt/image/renderable/RenderContext.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderContext__
-#define __java_awt_image_renderable_RenderContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-        namespace renderable
-        {
-            class RenderContext;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderContext : public ::java::lang::Object
-{
-
-public:
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::Shape *, ::java::awt::RenderingHints *);
-  RenderContext(::java::awt::geom::AffineTransform *);
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::Shape *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual void setRenderingHints(::java::awt::RenderingHints *);
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void preConcatenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void preConcetenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void concatenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void concetenateTransform(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void setAreaOfInterest(::java::awt::Shape *);
-  virtual ::java::awt::Shape * getAreaOfInterest();
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xform;
-  ::java::awt::Shape * aoi;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderContext__
diff --git a/libjava/java/awt/image/renderable/RenderableImage.h b/libjava/java/awt/image/renderable/RenderableImage.h
deleted file mode 100644
index c7fed510a1d..00000000000
--- a/libjava/java/awt/image/renderable/RenderableImage.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImage__
-#define __java_awt_image_renderable_RenderableImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderContext;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImage : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual jboolean isDynamic() = 0;
-  virtual jfloat getWidth() = 0;
-  virtual jfloat getHeight() = 0;
-  virtual jfloat getMinX() = 0;
-  virtual jfloat getMinY() = 0;
-  virtual ::java::awt::image::RenderedImage * createScaledRendering(jint, jint, ::java::awt::RenderingHints *) = 0;
-  virtual ::java::awt::image::RenderedImage * createDefaultRendering() = 0;
-  virtual ::java::awt::image::RenderedImage * createRendering(::java::awt::image::renderable::RenderContext *) = 0;
-  static ::java::lang::String * HINTS_OBSERVED;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_RenderableImage__
diff --git a/libjava/java/awt/image/renderable/RenderableImageOp.h b/libjava/java/awt/image/renderable/RenderableImageOp.h
deleted file mode 100644
index edc766d4e74..00000000000
--- a/libjava/java/awt/image/renderable/RenderableImageOp.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImageOp__
-#define __java_awt_image_renderable_RenderableImageOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ContextualRenderedImageFactory;
-            class ParameterBlock;
-            class RenderContext;
-            class RenderableImageOp;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImageOp : public ::java::lang::Object
-{
-
-public:
-  RenderableImageOp(::java::awt::image::renderable::ContextualRenderedImageFactory *, ::java::awt::image::renderable::ParameterBlock *);
-  virtual ::java::util::Vector * getSources();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getPropertyNames();
-  virtual jboolean isDynamic();
-  virtual jfloat getWidth();
-  virtual jfloat getHeight();
-  virtual jfloat getMinX();
-  virtual jfloat getMinY();
-  virtual ::java::awt::image::renderable::ParameterBlock * setParameterBlock(::java::awt::image::renderable::ParameterBlock *);
-  virtual ::java::awt::image::renderable::ParameterBlock * getParameterBlock();
-  virtual ::java::awt::image::RenderedImage * createScaledRendering(jint, jint, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::RenderedImage * createDefaultRendering();
-  virtual ::java::awt::image::RenderedImage * createRendering(::java::awt::image::renderable::RenderContext *);
-private:
-  ::java::awt::image::renderable::ContextualRenderedImageFactory * __attribute__((aligned(__alignof__( ::java::lang::Object)))) crif;
-  ::java::awt::image::renderable::ParameterBlock * block;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderableImageOp__
diff --git a/libjava/java/awt/image/renderable/RenderableImageProducer.h b/libjava/java/awt/image/renderable/RenderableImageProducer.h
deleted file mode 100644
index 4e1968fb84a..00000000000
--- a/libjava/java/awt/image/renderable/RenderableImageProducer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImageProducer__
-#define __java_awt_image_renderable_RenderableImageProducer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-        namespace renderable
-        {
-            class RenderContext;
-            class RenderableImage;
-            class RenderableImageProducer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImageProducer : public ::java::lang::Object
-{
-
-public:
-  RenderableImageProducer(::java::awt::image::renderable::RenderableImage *, ::java::awt::image::renderable::RenderContext *);
-  virtual void setRenderContext(::java::awt::image::renderable::RenderContext *);
-  virtual void addConsumer(::java::awt::image::ImageConsumer *);
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *);
-  virtual void startProduction(::java::awt::image::ImageConsumer *);
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-  virtual void run();
-private:
-  ::java::awt::image::renderable::RenderableImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::image::renderable::RenderContext * context;
-  ::java::util::ArrayList * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderableImageProducer__
diff --git a/libjava/java/awt/image/renderable/RenderedImageFactory.h b/libjava/java/awt/image/renderable/RenderedImageFactory.h
deleted file mode 100644
index 3e2eb934999..00000000000
--- a/libjava/java/awt/image/renderable/RenderedImageFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderedImageFactory__
-#define __java_awt_image_renderable_RenderedImageFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ParameterBlock;
-            class RenderedImageFactory;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderedImageFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::ParameterBlock *, ::java::awt::RenderingHints *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_RenderedImageFactory__
diff --git a/libjava/java/awt/peer/ButtonPeer.h b/libjava/java/awt/peer/ButtonPeer.h
deleted file mode 100644
index 781fd0e6fcb..00000000000
--- a/libjava/java/awt/peer/ButtonPeer.h
+++ /dev/null
@@ -1,118 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ButtonPeer__
-#define __java_awt_peer_ButtonPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ButtonPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::ButtonPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ButtonPeer__
diff --git a/libjava/java/awt/peer/CanvasPeer.h b/libjava/java/awt/peer/CanvasPeer.h
deleted file mode 100644
index 2f9ba7c1398..00000000000
--- a/libjava/java/awt/peer/CanvasPeer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_CanvasPeer__
-#define __java_awt_peer_CanvasPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class CanvasPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::CanvasPeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_CanvasPeer__
diff --git a/libjava/java/awt/peer/CheckboxMenuItemPeer.h b/libjava/java/awt/peer/CheckboxMenuItemPeer.h
deleted file mode 100644
index 84a5ba9ae89..00000000000
--- a/libjava/java/awt/peer/CheckboxMenuItemPeer.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_CheckboxMenuItemPeer__
-#define __java_awt_peer_CheckboxMenuItemPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace peer
-      {
-          class CheckboxMenuItemPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::CheckboxMenuItemPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setState(jboolean) = 0;
-  virtual void disable() = 0;
-  virtual void enable() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_CheckboxMenuItemPeer__
diff --git a/libjava/java/awt/peer/CheckboxPeer.h b/libjava/java/awt/peer/CheckboxPeer.h
deleted file mode 100644
index 72e05ee204a..00000000000
--- a/libjava/java/awt/peer/CheckboxPeer.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_CheckboxPeer__
-#define __java_awt_peer_CheckboxPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class CheckboxGroup;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class CheckboxPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::CheckboxPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void setState(jboolean) = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_CheckboxPeer__
diff --git a/libjava/java/awt/peer/ChoicePeer.h b/libjava/java/awt/peer/ChoicePeer.h
deleted file mode 100644
index 9a152d69322..00000000000
--- a/libjava/java/awt/peer/ChoicePeer.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ChoicePeer__
-#define __java_awt_peer_ChoicePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ChoicePeer;
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::ChoicePeer : public ::java::lang::Object
-{
-
-public:
-  virtual void add(::java::lang::String *, jint) = 0;
-  virtual void addItem(::java::lang::String *, jint) = 0;
-  virtual void remove(jint) = 0;
-  virtual void removeAll() = 0;
-  virtual void select(jint) = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ChoicePeer__
diff --git a/libjava/java/awt/peer/ComponentPeer.h b/libjava/java/awt/peer/ComponentPeer.h
deleted file mode 100644
index 5bcd8876f4f..00000000000
--- a/libjava/java/awt/peer/ComponentPeer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ComponentPeer__
-#define __java_awt_peer_ComponentPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ComponentPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::ComponentPeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ComponentPeer__
diff --git a/libjava/java/awt/peer/ContainerPeer.h b/libjava/java/awt/peer/ContainerPeer.h
deleted file mode 100644
index d1d26a02bd8..00000000000
--- a/libjava/java/awt/peer/ContainerPeer.h
+++ /dev/null
@@ -1,127 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ContainerPeer__
-#define __java_awt_peer_ContainerPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::ContainerPeer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Insets * insets() = 0;
-  virtual ::java::awt::Insets * getInsets() = 0;
-  virtual void beginValidate() = 0;
-  virtual void endValidate() = 0;
-  virtual void beginLayout() = 0;
-  virtual void endLayout() = 0;
-  virtual jboolean isPaintPending() = 0;
-  virtual jboolean isRestackSupported() = 0;
-  virtual void cancelPendingPaint(jint, jint, jint, jint) = 0;
-  virtual void restack() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ContainerPeer__
diff --git a/libjava/java/awt/peer/DesktopPeer.h b/libjava/java/awt/peer/DesktopPeer.h
deleted file mode 100644
index fa5529abe3b..00000000000
--- a/libjava/java/awt/peer/DesktopPeer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_DesktopPeer__
-#define __java_awt_peer_DesktopPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Desktop$Action;
-      namespace peer
-      {
-          class DesktopPeer;
-      }
-    }
-    namespace net
-    {
-        class URI;
-    }
-  }
-}
-
-class java::awt::peer::DesktopPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void browse(::java::net::URI *) = 0;
-  virtual void edit(::java::io::File *) = 0;
-  virtual jboolean isSupported(::java::awt::Desktop$Action *) = 0;
-  virtual void mail(::java::net::URI *) = 0;
-  virtual void mail() = 0;
-  virtual void open(::java::io::File *) = 0;
-  virtual void print(::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_DesktopPeer__
diff --git a/libjava/java/awt/peer/DialogPeer.h b/libjava/java/awt/peer/DialogPeer.h
deleted file mode 100644
index 95f9e0c1c85..00000000000
--- a/libjava/java/awt/peer/DialogPeer.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_DialogPeer__
-#define __java_awt_peer_DialogPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dialog;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class DialogPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::DialogPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setResizable(jboolean) = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 0;
-  virtual void setAlwaysOnTop(jboolean) = 0;
-  virtual void updateFocusableWindowState() = 0;
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
-  virtual void updateMinimumSize() = 0;
-  virtual void updateIconImages() = 0;
-  virtual ::java::awt::Insets * insets() = 0;
-  virtual ::java::awt::Insets * getInsets() = 0;
-  virtual void beginValidate() = 0;
-  virtual void endValidate() = 0;
-  virtual void beginLayout() = 0;
-  virtual void endLayout() = 0;
-  virtual jboolean isPaintPending() = 0;
-  virtual jboolean isRestackSupported() = 0;
-  virtual void cancelPendingPaint(jint, jint, jint, jint) = 0;
-  virtual void restack() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_DialogPeer__
diff --git a/libjava/java/awt/peer/FileDialogPeer.h b/libjava/java/awt/peer/FileDialogPeer.h
deleted file mode 100644
index 22575b60041..00000000000
--- a/libjava/java/awt/peer/FileDialogPeer.h
+++ /dev/null
@@ -1,143 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_FileDialogPeer__
-#define __java_awt_peer_FileDialogPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dialog;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class FileDialogPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::FileDialogPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setFile(::java::lang::String *) = 0;
-  virtual void setDirectory(::java::lang::String *) = 0;
-  virtual void setFilenameFilter(::java::io::FilenameFilter *) = 0;
-  virtual void setResizable(jboolean) = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 0;
-  virtual void setAlwaysOnTop(jboolean) = 0;
-  virtual void updateFocusableWindowState() = 0;
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
-  virtual void updateMinimumSize() = 0;
-  virtual void updateIconImages() = 0;
-  virtual ::java::awt::Insets * insets() = 0;
-  virtual ::java::awt::Insets * getInsets() = 0;
-  virtual void beginValidate() = 0;
-  virtual void endValidate() = 0;
-  virtual void beginLayout() = 0;
-  virtual void endLayout() = 0;
-  virtual jboolean isPaintPending() = 0;
-  virtual jboolean isRestackSupported() = 0;
-  virtual void cancelPendingPaint(jint, jint, jint, jint) = 0;
-  virtual void restack() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_FileDialogPeer__
diff --git a/libjava/java/awt/peer/FontPeer.h b/libjava/java/awt/peer/FontPeer.h
deleted file mode 100644
index 00f6f8a4fdb..00000000000
--- a/libjava/java/awt/peer/FontPeer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_FontPeer__
-#define __java_awt_peer_FontPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace peer
-      {
-          class FontPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::FontPeer : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_FontPeer__
diff --git a/libjava/java/awt/peer/FramePeer.h b/libjava/java/awt/peer/FramePeer.h
deleted file mode 100644
index e340e134b9d..00000000000
--- a/libjava/java/awt/peer/FramePeer.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_FramePeer__
-#define __java_awt_peer_FramePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dialog;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class MenuBar;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class FramePeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::FramePeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setIconImage(::java::awt::Image *) = 0;
-  virtual void setMenuBar(::java::awt::MenuBar *) = 0;
-  virtual void setResizable(jboolean) = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual jint getState() = 0;
-  virtual void setState(jint) = 0;
-  virtual void setMaximizedBounds(::java::awt::Rectangle *) = 0;
-  virtual jboolean isRestackSupported() = 0;
-  virtual void setBoundsPrivate(jint, jint, jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getBoundsPrivate() = 0;
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 0;
-  virtual void setAlwaysOnTop(jboolean) = 0;
-  virtual void updateFocusableWindowState() = 0;
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
-  virtual void updateMinimumSize() = 0;
-  virtual void updateIconImages() = 0;
-  virtual ::java::awt::Insets * insets() = 0;
-  virtual ::java::awt::Insets * getInsets() = 0;
-  virtual void beginValidate() = 0;
-  virtual void endValidate() = 0;
-  virtual void beginLayout() = 0;
-  virtual void endLayout() = 0;
-  virtual jboolean isPaintPending() = 0;
-  virtual void cancelPendingPaint(jint, jint, jint, jint) = 0;
-  virtual void restack() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_FramePeer__
diff --git a/libjava/java/awt/peer/LabelPeer.h b/libjava/java/awt/peer/LabelPeer.h
deleted file mode 100644
index 5247a0d0965..00000000000
--- a/libjava/java/awt/peer/LabelPeer.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_LabelPeer__
-#define __java_awt_peer_LabelPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class LabelPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::LabelPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setAlignment(jint) = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_LabelPeer__
diff --git a/libjava/java/awt/peer/LightweightPeer.h b/libjava/java/awt/peer/LightweightPeer.h
deleted file mode 100644
index b18182f8271..00000000000
--- a/libjava/java/awt/peer/LightweightPeer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_LightweightPeer__
-#define __java_awt_peer_LightweightPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class LightweightPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::LightweightPeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_LightweightPeer__
diff --git a/libjava/java/awt/peer/ListPeer.h b/libjava/java/awt/peer/ListPeer.h
deleted file mode 100644
index 0edfd625168..00000000000
--- a/libjava/java/awt/peer/ListPeer.h
+++ /dev/null
@@ -1,134 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ListPeer__
-#define __java_awt_peer_ListPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class ListPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::ListPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void add(::java::lang::String *, jint) = 0;
-  virtual void addItem(::java::lang::String *, jint) = 0;
-  virtual void clear() = 0;
-  virtual void delItems(jint, jint) = 0;
-  virtual void deselect(jint) = 0;
-  virtual JArray< jint > * getSelectedIndexes() = 0;
-  virtual void makeVisible(jint) = 0;
-  virtual ::java::awt::Dimension * minimumSize(jint) = 0;
-  virtual ::java::awt::Dimension * preferredSize(jint) = 0;
-  virtual void removeAll() = 0;
-  virtual void select(jint) = 0;
-  virtual void setMultipleMode(jboolean) = 0;
-  virtual void setMultipleSelections(jboolean) = 0;
-  virtual ::java::awt::Dimension * getPreferredSize(jint) = 0;
-  virtual ::java::awt::Dimension * getMinimumSize(jint) = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ListPeer__
diff --git a/libjava/java/awt/peer/MenuBarPeer.h b/libjava/java/awt/peer/MenuBarPeer.h
deleted file mode 100644
index e7d84c0519d..00000000000
--- a/libjava/java/awt/peer/MenuBarPeer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MenuBarPeer__
-#define __java_awt_peer_MenuBarPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Menu;
-      namespace peer
-      {
-          class MenuBarPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MenuBarPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void addMenu(::java::awt::Menu *) = 0;
-  virtual void addHelpMenu(::java::awt::Menu *) = 0;
-  virtual void delMenu(jint) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MenuBarPeer__
diff --git a/libjava/java/awt/peer/MenuComponentPeer.h b/libjava/java/awt/peer/MenuComponentPeer.h
deleted file mode 100644
index a0a1ea14c64..00000000000
--- a/libjava/java/awt/peer/MenuComponentPeer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MenuComponentPeer__
-#define __java_awt_peer_MenuComponentPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace peer
-      {
-          class MenuComponentPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MenuComponentPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MenuComponentPeer__
diff --git a/libjava/java/awt/peer/MenuItemPeer.h b/libjava/java/awt/peer/MenuItemPeer.h
deleted file mode 100644
index 8c9a9eee892..00000000000
--- a/libjava/java/awt/peer/MenuItemPeer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MenuItemPeer__
-#define __java_awt_peer_MenuItemPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace peer
-      {
-          class MenuItemPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MenuItemPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void disable() = 0;
-  virtual void enable() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MenuItemPeer__
diff --git a/libjava/java/awt/peer/MenuPeer.h b/libjava/java/awt/peer/MenuPeer.h
deleted file mode 100644
index 4c813b11824..00000000000
--- a/libjava/java/awt/peer/MenuPeer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MenuPeer__
-#define __java_awt_peer_MenuPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class MenuItem;
-      namespace peer
-      {
-          class MenuPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MenuPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void addItem(::java::awt::MenuItem *) = 0;
-  virtual void addSeparator() = 0;
-  virtual void delItem(jint) = 0;
-  virtual void disable() = 0;
-  virtual void enable() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MenuPeer__
diff --git a/libjava/java/awt/peer/MouseInfoPeer.h b/libjava/java/awt/peer/MouseInfoPeer.h
deleted file mode 100644
index 18f0c59b8d1..00000000000
--- a/libjava/java/awt/peer/MouseInfoPeer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MouseInfoPeer__
-#define __java_awt_peer_MouseInfoPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Window;
-      namespace peer
-      {
-          class MouseInfoPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MouseInfoPeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint fillPointWithCoords(::java::awt::Point *) = 0;
-  virtual jboolean isWindowUnderMouse(::java::awt::Window *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MouseInfoPeer__
diff --git a/libjava/java/awt/peer/PanelPeer.h b/libjava/java/awt/peer/PanelPeer.h
deleted file mode 100644
index b90c0570aa1..00000000000
--- a/libjava/java/awt/peer/PanelPeer.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_PanelPeer__
-#define __java_awt_peer_PanelPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class PanelPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::PanelPeer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Insets * insets() = 0;
-  virtual ::java::awt::Insets * getInsets() = 0;
-  virtual void beginValidate() = 0;
-  virtual void endValidate() = 0;
-  virtual void beginLayout() = 0;
-  virtual void endLayout() = 0;
-  virtual jboolean isPaintPending() = 0;
-  virtual jboolean isRestackSupported() = 0;
-  virtual void cancelPendingPaint(jint, jint, jint, jint) = 0;
-  virtual void restack() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_PanelPeer__
diff --git a/libjava/java/awt/peer/PopupMenuPeer.h b/libjava/java/awt/peer/PopupMenuPeer.h
deleted file mode 100644
index e8bdd57b52a..00000000000
--- a/libjava/java/awt/peer/PopupMenuPeer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_PopupMenuPeer__
-#define __java_awt_peer_PopupMenuPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Event;
-        class Font;
-        class MenuItem;
-      namespace peer
-      {
-          class PopupMenuPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::PopupMenuPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void show(::java::awt::Component *, jint, jint) = 0;
-  virtual void show(::java::awt::Event *) = 0;
-  virtual void addItem(::java::awt::MenuItem *) = 0;
-  virtual void addSeparator() = 0;
-  virtual void delItem(jint) = 0;
-  virtual void disable() = 0;
-  virtual void enable() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_PopupMenuPeer__
diff --git a/libjava/java/awt/peer/RobotPeer.h b/libjava/java/awt/peer/RobotPeer.h
deleted file mode 100644
index 7947c5031c3..00000000000
--- a/libjava/java/awt/peer/RobotPeer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_RobotPeer__
-#define __java_awt_peer_RobotPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace peer
-      {
-          class RobotPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::RobotPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void mouseMove(jint, jint) = 0;
-  virtual void mousePress(jint) = 0;
-  virtual void mouseRelease(jint) = 0;
-  virtual void mouseWheel(jint) = 0;
-  virtual void keyPress(jint) = 0;
-  virtual void keyRelease(jint) = 0;
-  virtual jint getRGBPixel(jint, jint) = 0;
-  virtual JArray< jint > * getRGBPixels(::java::awt::Rectangle *) = 0;
-  virtual void dispose() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_RobotPeer__
diff --git a/libjava/java/awt/peer/ScrollPanePeer.h b/libjava/java/awt/peer/ScrollPanePeer.h
deleted file mode 100644
index 25f9431f549..00000000000
--- a/libjava/java/awt/peer/ScrollPanePeer.h
+++ /dev/null
@@ -1,135 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ScrollPanePeer__
-#define __java_awt_peer_ScrollPanePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Adjustable;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class ScrollPanePeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::ScrollPanePeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint getHScrollbarHeight() = 0;
-  virtual jint getVScrollbarWidth() = 0;
-  virtual void setScrollPosition(jint, jint) = 0;
-  virtual void childResized(jint, jint) = 0;
-  virtual void setUnitIncrement(::java::awt::Adjustable *, jint) = 0;
-  virtual void setValue(::java::awt::Adjustable *, jint) = 0;
-  virtual ::java::awt::Insets * insets() = 0;
-  virtual ::java::awt::Insets * getInsets() = 0;
-  virtual void beginValidate() = 0;
-  virtual void endValidate() = 0;
-  virtual void beginLayout() = 0;
-  virtual void endLayout() = 0;
-  virtual jboolean isPaintPending() = 0;
-  virtual jboolean isRestackSupported() = 0;
-  virtual void cancelPendingPaint(jint, jint, jint, jint) = 0;
-  virtual void restack() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ScrollPanePeer__
diff --git a/libjava/java/awt/peer/ScrollbarPeer.h b/libjava/java/awt/peer/ScrollbarPeer.h
deleted file mode 100644
index b030ca5d90f..00000000000
--- a/libjava/java/awt/peer/ScrollbarPeer.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ScrollbarPeer__
-#define __java_awt_peer_ScrollbarPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class ScrollbarPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::ScrollbarPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setLineIncrement(jint) = 0;
-  virtual void setPageIncrement(jint) = 0;
-  virtual void setValues(jint, jint, jint, jint) = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ScrollbarPeer__
diff --git a/libjava/java/awt/peer/TextAreaPeer.h b/libjava/java/awt/peer/TextAreaPeer.h
deleted file mode 100644
index 24fb100d711..00000000000
--- a/libjava/java/awt/peer/TextAreaPeer.h
+++ /dev/null
@@ -1,141 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_TextAreaPeer__
-#define __java_awt_peer_TextAreaPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class TextAreaPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::TextAreaPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void insert(::java::lang::String *, jint) = 0;
-  virtual void insertText(::java::lang::String *, jint) = 0;
-  virtual ::java::awt::Dimension * minimumSize(jint, jint) = 0;
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint) = 0;
-  virtual ::java::awt::Dimension * preferredSize(jint, jint) = 0;
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint) = 0;
-  virtual void replaceRange(::java::lang::String *, jint, jint) = 0;
-  virtual void replaceText(::java::lang::String *, jint, jint) = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual void select(jint, jint) = 0;
-  virtual void setEditable(jboolean) = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual void setCaretPosition(jint) = 0;
-  virtual jint getIndexAtPoint(jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jlong filterEvents(jlong) = 0;
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_TextAreaPeer__
diff --git a/libjava/java/awt/peer/TextComponentPeer.h b/libjava/java/awt/peer/TextComponentPeer.h
deleted file mode 100644
index 71afe17f5a0..00000000000
--- a/libjava/java/awt/peer/TextComponentPeer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_TextComponentPeer__
-#define __java_awt_peer_TextComponentPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class TextComponentPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::TextComponentPeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint getSelectionEnd() = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual void select(jint, jint) = 0;
-  virtual void setEditable(jboolean) = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual void setCaretPosition(jint) = 0;
-  virtual jint getIndexAtPoint(jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jlong filterEvents(jlong) = 0;
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_TextComponentPeer__
diff --git a/libjava/java/awt/peer/TextFieldPeer.h b/libjava/java/awt/peer/TextFieldPeer.h
deleted file mode 100644
index a2785b1b6bc..00000000000
--- a/libjava/java/awt/peer/TextFieldPeer.h
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_TextFieldPeer__
-#define __java_awt_peer_TextFieldPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class TextFieldPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::TextFieldPeer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Dimension * minimumSize(jint) = 0;
-  virtual ::java::awt::Dimension * preferredSize(jint) = 0;
-  virtual ::java::awt::Dimension * getMinimumSize(jint) = 0;
-  virtual ::java::awt::Dimension * getPreferredSize(jint) = 0;
-  virtual void setEchoChar(jchar) = 0;
-  virtual void setEchoCharacter(jchar) = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual void select(jint, jint) = 0;
-  virtual void setEditable(jboolean) = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual void setCaretPosition(jint) = 0;
-  virtual jint getIndexAtPoint(jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jlong filterEvents(jlong) = 0;
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_TextFieldPeer__
diff --git a/libjava/java/awt/peer/WindowPeer.h b/libjava/java/awt/peer/WindowPeer.h
deleted file mode 100644
index 0257d8cb88c..00000000000
--- a/libjava/java/awt/peer/WindowPeer.h
+++ /dev/null
@@ -1,138 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_WindowPeer__
-#define __java_awt_peer_WindowPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Color;
-        class Component;
-        class Cursor;
-        class Dialog;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-        class Toolkit;
-      namespace event
-      {
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class WindowPeer;
-      }
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class java::awt::peer::WindowPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 0;
-  virtual void setAlwaysOnTop(jboolean) = 0;
-  virtual void updateFocusableWindowState() = 0;
-  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
-  virtual void updateMinimumSize() = 0;
-  virtual void updateIconImages() = 0;
-  virtual ::java::awt::Insets * insets() = 0;
-  virtual ::java::awt::Insets * getInsets() = 0;
-  virtual void beginValidate() = 0;
-  virtual void endValidate() = 0;
-  virtual void beginLayout() = 0;
-  virtual void endLayout() = 0;
-  virtual jboolean isPaintPending() = 0;
-  virtual jboolean isRestackSupported() = 0;
-  virtual void cancelPendingPaint(jint, jint, jint, jint) = 0;
-  virtual void restack() = 0;
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *) = 0;
-  virtual ::java::awt::Image * createImage(jint, jint) = 0;
-  virtual void disable() = 0;
-  virtual void dispose() = 0;
-  virtual void enable() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Dimension * getMinimumSize() = 0;
-  virtual ::java::awt::Dimension * getPreferredSize() = 0;
-  virtual ::java::awt::Toolkit * getToolkit() = 0;
-  virtual void handleEvent(::java::awt::AWTEvent *) = 0;
-  virtual void hide() = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual jboolean isFocusable() = 0;
-  virtual ::java::awt::Dimension * minimumSize() = 0;
-  virtual ::java::awt::Dimension * preferredSize() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual void print(::java::awt::Graphics *) = 0;
-  virtual void repaint(jlong, jint, jint, jint, jint) = 0;
-  virtual void requestFocus() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong) = 0;
-  virtual void reshape(jint, jint, jint, jint) = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual void setBounds(jint, jint, jint, jint) = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void show() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration() = 0;
-  virtual void setEventMask(jlong) = 0;
-  virtual jboolean isObscured() = 0;
-  virtual jboolean canDetermineObscurity() = 0;
-  virtual void coalescePaintEvent(::java::awt::event::PaintEvent *) = 0;
-  virtual void updateCursorImmediately() = 0;
-  virtual jboolean handlesWheelScrolling() = 0;
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint) = 0;
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *) = 0;
-  virtual ::java::awt::Image * getBackBuffer() = 0;
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *) = 0;
-  virtual void destroyBuffers() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void reparent(::java::awt::peer::ContainerPeer *) = 0;
-  virtual void setBounds(jint, jint, jint, jint, jint) = 0;
-  virtual jboolean isReparentSupported() = 0;
-  virtual void layout() = 0;
-  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_WindowPeer__
diff --git a/libjava/java/awt/print/Book.h b/libjava/java/awt/print/Book.h
deleted file mode 100644
index cda28618c75..00000000000
--- a/libjava/java/awt/print/Book.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_Book__
-#define __java_awt_print_Book__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class Book;
-          class PageFormat;
-          class Printable;
-      }
-    }
-  }
-}
-
-class java::awt::print::Book : public ::java::lang::Object
-{
-
-public:
-  Book();
-  virtual jint getNumberOfPages();
-  virtual ::java::awt::print::PageFormat * getPageFormat(jint);
-  virtual ::java::awt::print::Printable * getPrintable(jint);
-  virtual void append(::java::awt::print::Printable *, ::java::awt::print::PageFormat *);
-  virtual void append(::java::awt::print::Printable *, ::java::awt::print::PageFormat *, jint);
-  virtual void setPage(jint, ::java::awt::print::Printable *, ::java::awt::print::PageFormat *);
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) printables;
-  ::java::util::Vector * page_formats;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_Book__
diff --git a/libjava/java/awt/print/NoPrinterJob.h b/libjava/java/awt/print/NoPrinterJob.h
deleted file mode 100644
index aac0af30b5a..00000000000
--- a/libjava/java/awt/print/NoPrinterJob.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_NoPrinterJob__
-#define __java_awt_print_NoPrinterJob__
-
-#pragma interface
-
-#include <java/awt/print/PrinterJob.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class NoPrinterJob;
-          class PageFormat;
-          class Pageable;
-          class Printable;
-      }
-    }
-  }
-}
-
-class java::awt::print::NoPrinterJob : public ::java::awt::print::PrinterJob
-{
-
-public: // actually package-private
-  NoPrinterJob();
-public:
-  virtual jint getCopies();
-  virtual void setCopies(jint);
-  virtual ::java::lang::String * getJobName();
-  virtual void setJobName(::java::lang::String *);
-  virtual ::java::lang::String * getUserName();
-  virtual void cancel();
-  virtual jboolean isCancelled();
-  virtual ::java::awt::print::PageFormat * defaultPage(::java::awt::print::PageFormat *);
-  virtual ::java::awt::print::PageFormat * pageDialog(::java::awt::print::PageFormat *);
-  virtual void print();
-  virtual jboolean printDialog();
-  virtual void setPageable(::java::awt::print::Pageable *);
-  virtual void setPrintable(::java::awt::print::Printable *);
-  virtual void setPrintable(::java::awt::print::Printable *, ::java::awt::print::PageFormat *);
-  virtual ::java::awt::print::PageFormat * validatePage(::java::awt::print::PageFormat *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_NoPrinterJob__
diff --git a/libjava/java/awt/print/PageFormat.h b/libjava/java/awt/print/PageFormat.h
deleted file mode 100644
index 0f4af7b653b..00000000000
--- a/libjava/java/awt/print/PageFormat.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PageFormat__
-#define __java_awt_print_PageFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PageFormat;
-          class Paper;
-      }
-    }
-  }
-}
-
-class java::awt::print::PageFormat : public ::java::lang::Object
-{
-
-public:
-  PageFormat();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jdouble getImageableX();
-  virtual jdouble getImageableY();
-  virtual jdouble getImageableWidth();
-  virtual jdouble getImageableHeight();
-  virtual ::java::awt::print::Paper * getPaper();
-  virtual void setPaper(::java::awt::print::Paper *);
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual JArray< jdouble > * getMatrix();
-  virtual ::java::lang::Object * clone();
-  static const jint LANDSCAPE = 0;
-  static const jint PORTRAIT = 1;
-  static const jint REVERSE_LANDSCAPE = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) orientation;
-  ::java::awt::print::Paper * paper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PageFormat__
diff --git a/libjava/java/awt/print/Pageable.h b/libjava/java/awt/print/Pageable.h
deleted file mode 100644
index b97d4e5222a..00000000000
--- a/libjava/java/awt/print/Pageable.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_Pageable__
-#define __java_awt_print_Pageable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-      }
-    }
-  }
-}
-
-class java::awt::print::Pageable : public ::java::lang::Object
-{
-
-public:
-  virtual jint getNumberOfPages() = 0;
-  virtual ::java::awt::print::PageFormat * getPageFormat(jint) = 0;
-  virtual ::java::awt::print::Printable * getPrintable(jint) = 0;
-  static const jint UNKNOWN_NUMBER_OF_PAGES = -1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_print_Pageable__
diff --git a/libjava/java/awt/print/Paper.h b/libjava/java/awt/print/Paper.h
deleted file mode 100644
index 3d7d3769ff6..00000000000
--- a/libjava/java/awt/print/Paper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_Paper__
-#define __java_awt_print_Paper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class Paper;
-      }
-    }
-  }
-}
-
-class java::awt::print::Paper : public ::java::lang::Object
-{
-
-public:
-  Paper();
-  virtual jdouble getHeight();
-  virtual jdouble getWidth();
-  virtual jdouble getImageableX();
-  virtual jdouble getImageableY();
-  virtual jdouble getImageableWidth();
-  virtual jdouble getImageableHeight();
-  virtual void setSize(jdouble, jdouble);
-  virtual void setImageableArea(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::lang::Object * clone();
-private:
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) height;
-  jdouble width;
-  jdouble imageableX;
-  jdouble imageableY;
-  jdouble imageableWidth;
-  jdouble imageableHeight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_Paper__
diff --git a/libjava/java/awt/print/Printable.h b/libjava/java/awt/print/Printable.h
deleted file mode 100644
index 4160afcfd01..00000000000
--- a/libjava/java/awt/print/Printable.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_Printable__
-#define __java_awt_print_Printable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-      namespace print
-      {
-          class PageFormat;
-          class Printable;
-      }
-    }
-  }
-}
-
-class java::awt::print::Printable : public ::java::lang::Object
-{
-
-public:
-  virtual jint print(::java::awt::Graphics *, ::java::awt::print::PageFormat *, jint) = 0;
-  static const jint PAGE_EXISTS = 0;
-  static const jint NO_SUCH_PAGE = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_print_Printable__
diff --git a/libjava/java/awt/print/PrinterAbortException.h b/libjava/java/awt/print/PrinterAbortException.h
deleted file mode 100644
index f8475d995cb..00000000000
--- a/libjava/java/awt/print/PrinterAbortException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterAbortException__
-#define __java_awt_print_PrinterAbortException__
-
-#pragma interface
-
-#include <java/awt/print/PrinterException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PrinterAbortException;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterAbortException : public ::java::awt::print::PrinterException
-{
-
-public:
-  PrinterAbortException();
-  PrinterAbortException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4725169026278854136LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PrinterAbortException__
diff --git a/libjava/java/awt/print/PrinterException.h b/libjava/java/awt/print/PrinterException.h
deleted file mode 100644
index 009ec510f52..00000000000
--- a/libjava/java/awt/print/PrinterException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterException__
-#define __java_awt_print_PrinterException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PrinterException;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterException : public ::java::lang::Exception
-{
-
-public:
-  PrinterException();
-  PrinterException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3757589981158265819LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PrinterException__
diff --git a/libjava/java/awt/print/PrinterGraphics.h b/libjava/java/awt/print/PrinterGraphics.h
deleted file mode 100644
index 74541c07a9e..00000000000
--- a/libjava/java/awt/print/PrinterGraphics.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterGraphics__
-#define __java_awt_print_PrinterGraphics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PrinterGraphics;
-          class PrinterJob;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterGraphics : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::print::PrinterJob * getPrinterJob() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_print_PrinterGraphics__
diff --git a/libjava/java/awt/print/PrinterIOException.h b/libjava/java/awt/print/PrinterIOException.h
deleted file mode 100644
index 46d7908d9a3..00000000000
--- a/libjava/java/awt/print/PrinterIOException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterIOException__
-#define __java_awt_print_PrinterIOException__
-
-#pragma interface
-
-#include <java/awt/print/PrinterException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PrinterIOException;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterIOException : public ::java::awt::print::PrinterException
-{
-
-public:
-  PrinterIOException(::java::io::IOException *);
-  virtual ::java::io::IOException * getIOException();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = 5850870712125932846LL;
-  ::java::io::IOException * __attribute__((aligned(__alignof__( ::java::awt::print::PrinterException)))) mException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PrinterIOException__
diff --git a/libjava/java/awt/print/PrinterJob.h b/libjava/java/awt/print/PrinterJob.h
deleted file mode 100644
index 39bb9a0e9cf..00000000000
--- a/libjava/java/awt/print/PrinterJob.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterJob__
-#define __java_awt_print_PrinterJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-          class PrinterJob;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class PrintService;
-        class StreamPrintServiceFactory;
-      namespace attribute
-      {
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterJob : public ::java::lang::Object
-{
-
-public:
-  static ::java::awt::print::PrinterJob * getPrinterJob();
-  PrinterJob();
-  virtual jint getCopies() = 0;
-  virtual void setCopies(jint) = 0;
-  virtual ::java::lang::String * getJobName() = 0;
-  virtual void setJobName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getUserName() = 0;
-  virtual void cancel() = 0;
-  virtual jboolean isCancelled() = 0;
-  virtual ::java::awt::print::PageFormat * defaultPage();
-  virtual ::java::awt::print::PageFormat * defaultPage(::java::awt::print::PageFormat *) = 0;
-  virtual ::java::awt::print::PageFormat * pageDialog(::java::awt::print::PageFormat *) = 0;
-  virtual ::java::awt::print::PageFormat * pageDialog(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual void print() = 0;
-  virtual void print(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual jboolean printDialog() = 0;
-  virtual jboolean printDialog(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual void setPageable(::java::awt::print::Pageable *) = 0;
-  virtual void setPrintable(::java::awt::print::Printable *) = 0;
-  virtual void setPrintable(::java::awt::print::Printable *, ::java::awt::print::PageFormat *) = 0;
-  virtual ::java::awt::print::PageFormat * validatePage(::java::awt::print::PageFormat *) = 0;
-  static JArray< ::javax::print::PrintService * > * lookupPrintServices();
-  static JArray< ::javax::print::StreamPrintServiceFactory * > * lookupStreamPrintServices(::java::lang::String *);
-  virtual ::javax::print::PrintService * getPrintService();
-  virtual void setPrintService(::javax::print::PrintService *);
-private:
-  ::javax::print::PrintService * __attribute__((aligned(__alignof__( ::java::lang::Object)))) printer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PrinterJob__