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

29 files changed, 0 insertions, 2846 deletions

diff --git a/libjava/java/awt/peer/ButtonPeer.h b/libjava/java/awt/peer/ButtonPeer.h
deleted file mode 100644
index 781fd0e..0000000
--- 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 2f9ba7c..0000000
--- 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 84a5ba9..0000000
--- 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 72e05ee..0000000
--- 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 9a152d6..0000000
--- 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 5bcd887..0000000
--- 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 d1d26a0..0000000
--- 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 fa5529a..0000000
--- 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 95f9e0c..0000000
--- 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 22575b6..0000000
--- 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 00f6f8a..0000000
--- 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 e340e13..0000000
--- 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 5247a0d..0000000
--- 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 b18182f..0000000
--- 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 0edfd62..0000000
--- 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 e7d84c0..0000000
--- 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 a0a1ea1..0000000
--- 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 8c9a9ee..0000000
--- 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 4c813b1..0000000
--- 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 18f0c59..0000000
--- 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 b90c057..0000000
--- 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 e8bdd57..0000000
--- 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 7947c50..0000000
--- 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 25f9431..0000000
--- 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 b030ca5..0000000
--- 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 24fb100..0000000
--- 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 71afe17..0000000
--- 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 a2785b1..0000000
--- 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 0257d8c..0000000
--- 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__